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 /include | |
| 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 'include')
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | include/zot.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1c1a4479d..ec887fc6c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1622,11 +1622,9 @@ function network_tabs() { // tabs $tabs = array(); - $d = get_config('system','disable_discover_tab'); - if($d === false) - $d = 1; + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - if(! $d) { + if(! $disable_discover_tab) { $tabs[] = array( 'label' => t('Discover'), 'url' => z_root() . '/' . $cmd . '?f=&fh=1' , diff --git a/include/zot.php b/include/zot.php index 8bbc4a969..4d056ffeb 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1326,8 +1326,10 @@ function public_recips($msg) { $include_sys = false; if($msg['message']['type'] === 'activity') { - 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) $include_sys = true; + $perm = 'send_stream'; if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) { |