aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-20 16:14:01 -0700
committerzotlabs <mike@macgirvin.com>2016-10-20 16:14:01 -0700
commit8a34f7ca7b446be390153d805965bf4cd0501b3d (patch)
treedf551849a823dbaf10741fc6c2af344217e2fedb /include
parente2e3b81f323957495a643a9087b663df03dac2d9 (diff)
parentedde78521959ee544f5e77b134e3e6dd4f75bf02 (diff)
downloadvolse-hubzilla-8a34f7ca7b446be390153d805965bf4cd0501b3d.tar.gz
volse-hubzilla-8a34f7ca7b446be390153d805965bf4cd0501b3d.tar.bz2
volse-hubzilla-8a34f7ca7b446be390153d805965bf4cd0501b3d.zip
Merge branch 'dev' into pdo
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index bc8f8ce8b..43533e3c1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1536,7 +1536,11 @@ function network_tabs() {
// tabs
$tabs = array();
- if(! get_config('system','disable_discover_tab')) {
+ $d = get_config('system','disable_discover_tab');
+ if($d === false)
+ $d = 1;
+
+ if(! $d) {
$tabs[] = array(
'label' => t('Discover'),
'url' => z_root() . '/' . $cmd . '?f=&fh=1' ,