aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-08-06 21:40:39 +0200
committergit-marijus <mario@mariovavti.com>2017-08-06 21:40:39 +0200
commit68b32cd8f414fc3df1279a3458082b2d8dfc3430 (patch)
tree40768e806965ade0f5157fcc0f53bb30578e93fc /include
parenta618f70f56efdcaaf9da6dcfcab9cce6a933303b (diff)
downloadvolse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.tar.gz
volse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.tar.bz2
volse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.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.php6
-rw-r--r--include/zot.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 460c97efb..13ae571d6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1624,11 +1624,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 75c37836d..3e2a66734 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1344,8 +1344,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'])) {