diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-15 09:00:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-15 09:00:52 +0100 |
| commit | 45b42cbc1c5356da61923f5bc2fbca1cec9f9119 (patch) | |
| tree | b052b2d5e52b751aa7242e7938fca56879d2da7e /Zotlabs/Module/Pubstream.php | |
| parent | 033608292007a726b6fdffe839f6e481939f7a1d (diff) | |
| parent | 465d89129caaaa0240229f8d6f81d68f26eb60b0 (diff) | |
| download | volse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.tar.gz volse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.tar.bz2 volse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 16a5fdbba..afe53eca7 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -12,11 +12,10 @@ class Pubstream extends \Zotlabs\Web\Controller { if($load) $_SESSION['loadtime'] = datetime_convert(); - - if(observer_prohibited(true)) { - return login(); + if((observer_prohibited(true)) || (! (intval(get_config('system','open_pubstream',1))) && 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); |