aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-28 15:27:58 -0800
committerfriendica <info@friendica.com>2015-01-28 15:27:58 -0800
commit54fd8b21db2d8f3841cf590f88611a1d4f44ce48 (patch)
treed13470c3e4316a94504cbccf20f5dcffdf8b2468
parent2c02f1184cc576eaced4b72ae7ec6fd54c347ea7 (diff)
downloadvolse-hubzilla-54fd8b21db2d8f3841cf590f88611a1d4f44ce48.tar.gz
volse-hubzilla-54fd8b21db2d8f3841cf590f88611a1d4f44ce48.tar.bz2
volse-hubzilla-54fd8b21db2d8f3841cf590f88611a1d4f44ce48.zip
make sure we honour the disable_discover_tab pref
-rwxr-xr-xinclude/diaspora.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 655f5750a..767758164 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -15,7 +15,11 @@ function diaspora_dispatch_public($msg) {
return;
}
- $sys_disabled = get_config('system','disable_diaspora_discover_tab');
+ $sys_disabled = true;
+
+ if(! get_config('system','disable_discover_tab')) {
+ $sys_disabled = get_config('system','disable_diaspora_discover_tab');
+ }
$sys = (($sys_disabled) ? null : get_sys_channel());
// find everybody following or allowing this author