diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-18 14:17:33 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-18 14:17:33 -0800 |
| commit | 89aa882c95b4d01bd7bf6ff461c1dcefdedea7bd (patch) | |
| tree | 672bdd787b969c495d2a279da14c0781adb89a29 /Zotlabs/Module/Pubstream.php | |
| parent | 62e3083f23283d59c8e76c1bd8ccb2a07403551c (diff) | |
| parent | a0e1a8e0a20df640ef951dee4fb3c6ed19faee03 (diff) | |
| download | volse-hubzilla-89aa882c95b4d01bd7bf6ff461c1dcefdedea7bd.tar.gz volse-hubzilla-89aa882c95b4d01bd7bf6ff461c1dcefdedea7bd.tar.bz2 volse-hubzilla-89aa882c95b4d01bd7bf6ff461c1dcefdedea7bd.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index c469a0eca..2c25e2ce0 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -17,9 +17,16 @@ class Pubstream extends \Zotlabs\Web\Controller { return login(); } - $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - if($disable_discover_tab) - return; + $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); + $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + + if(! ($site_firehose || $net_firehose)) { + return ''; + } + + if($net_firehose) { + $site_firehose = false; + } $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); @@ -142,7 +149,7 @@ class Pubstream extends \Zotlabs\Web\Controller { require_once('include/channel.php'); require_once('include/security.php'); - if(get_config('system','site_firehose')) { + if($site_firehose) { $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and item_wall = 1 "; } else { |