diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-23 22:12:29 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-23 22:12:29 -0800 |
| commit | e6f9f284bf04f0dc0471fa08d7dac118effe4ccb (patch) | |
| tree | 4b4c1bd14069fd97a616abec87c2f429d3bde39e | |
| parent | 7ddf51722cdbe2d69084b7e9597fc6b11aeeb686 (diff) | |
| download | volse-hubzilla-e6f9f284bf04f0dc0471fa08d7dac118effe4ccb.tar.gz volse-hubzilla-e6f9f284bf04f0dc0471fa08d7dac118effe4ccb.tar.bz2 volse-hubzilla-e6f9f284bf04f0dc0471fa08d7dac118effe4ccb.zip | |
open_pubstream logic was messy and wrong
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index af7bc7658..79f205a22 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -12,10 +12,16 @@ class Pubstream extends \Zotlabs\Web\Controller { if($load) $_SESSION['loadtime'] = datetime_convert(); - if((observer_prohibited(true)) || (! (intval(get_config('system','open_pubstream',1))) && get_observer_hash())) { + if((observer_prohibited(true))) { return login(); } + if(! intval(get_config('system','open_pubstream',1))) { + if(! get_observer_hash()) { + return login(); + } + } + $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); |