aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-26 21:50:17 -0800
committerzotlabs <mike@macgirvin.com>2018-02-26 21:50:17 -0800
commit6c37a389807c28198a9eefae9dc479bc714981c3 (patch)
treeeeb93bf6ec166eb7f87b38cf8931e1d1cc7487dd
parent5277e79fa2dcac5ddd5e4577fb1719fe57ee3829 (diff)
downloadvolse-hubzilla-6c37a389807c28198a9eefae9dc479bc714981c3.tar.gz
volse-hubzilla-6c37a389807c28198a9eefae9dc479bc714981c3.tar.bz2
volse-hubzilla-6c37a389807c28198a9eefae9dc479bc714981c3.zip
fix public stream app permission check to match the recent fixes to the Module
-rwxr-xr-xboot.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index dbc5e6dcc..0c3db1531 100755
--- a/boot.php
+++ b/boot.php
@@ -1686,10 +1686,15 @@ function remote_channel() {
function can_view_public_stream() {
- if((observer_prohibited(true))
- || (! (intval(get_config('system','open_pubstream',1))) && get_observer_hash())) {
+ if(observer_prohibited(true)) {
return false;
}
+
+ if(! (intval(get_config('system','open_pubstream',1)))) {
+ if(! get_observer_hash()) {
+ return false;
+ }
+ }
$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
$net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true);