diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-02-24 06:48:56 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-02-24 06:48:56 -0500 |
| commit | 497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8 (patch) | |
| tree | 784b6afd1e7b5f855dce8c4d1d703697cdac56e6 /Zotlabs/Module/Pubstream.php | |
| parent | 64ee42fc3d00765bc5c60e451b86230ea38ffdfb (diff) | |
| parent | f6d024cb3f2663cd1d61e5fc18546adb93b9a7db (diff) | |
| download | volse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.tar.gz volse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.tar.bz2 volse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -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); |