diff options
| author | git-marijus <mario@mariovavti.com> | 2017-08-06 21:40:39 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-06 23:34:05 +0200 |
| commit | 0085b64b2bb22cf463ec66376d06d64d5b5b5730 (patch) | |
| tree | 0f99658f095296826b21c7545a6657bd77e1de19 /Zotlabs/Module | |
| parent | 913046aa28740f91d5aa16f0bfa8c764a7a24c03 (diff) | |
| download | volse-hubzilla-0085b64b2bb22cf463ec66376d06d64d5b5b5730.tar.gz volse-hubzilla-0085b64b2bb22cf463ec66376d06d64d5b5b5730.tar.bz2 volse-hubzilla-0085b64b2bb22cf463ec66376d06d64d5b5b5730.zip | |
consolidate disable_discover_tab config if it was not yet set to either 1 or 0 in DB
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 45623c7b0..e5c059af5 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -409,8 +409,9 @@ class Network extends \Zotlabs\Web\Controller { } $abook_uids = " and abook.abook_channel = " . local_channel() . " "; - - if($firehose && (! get_config('system','disable_discover_tab'))) { + + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($firehose && (! $disable_discover_tab)) { require_once('include/channel.php'); $sys = get_sys_channel(); $uids = " and item.uid = " . intval($sys['channel_id']) . " "; diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 28c34425c..42aa2b51b 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -16,8 +16,8 @@ class Pubstream extends \Zotlabs\Web\Controller { return login(); } - - if(get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($disable_discover_tab) return; $item_normal = item_normal(); |