Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: include/diaspora.php
2015-07-23 21:07:35 -07:00
parent c0e67db070 908da4589d
commit cc5b0cde1d
6 changed files with 10 additions and 6 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -1256,7 +1256,8 @@ function public_recips($msg) {
 	$include_sys = false;

 	if($msg['message']['type'] === 'activity') {
-		$include_sys = true;
+		if(! get_config('system','disable_discover_tab'))
+			$include_sys = true;
 		$col = 'channel_w_stream';
 		$field = PERMS_W_STREAM;
 		if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {