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

Conflicts:
	include/diaspora.php

3 files changed, 8 insertions, 2 deletions

diff --git a/include/comanche.php b/include/comanche.php
index 57056ae2a..9585a6578 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -284,6 +284,11 @@ function comanche_widget($name, $text) {
 
 	if(file_exists('widget/' . trim($name) . '.php'))
 		require_once('widget/' . trim($name) . '.php');
+	else {
+		$theme_widget = 'widget_' . trim($name) . '.php';
+		if(theme_include($theme_widget))
+			require_once(theme_include($theme_widget));
+	}
 
 	$func = 'widget_' . trim($name);
 	if (function_exists($func))
diff --git a/include/items.php b/include/items.php
index 9a2c8d5da..7dd5a01d7 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3386,7 +3386,7 @@ function post_is_importable($item,$abook) {
 
 	$lang = null;
 
-	if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false))
+	if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false))
 		$lang = detect_language($text);
 
 	$tags = ((count($item['term'])) ? $item['term'] : false);
diff --git a/include/zot.php b/include/zot.php
index 89d6c6616..0cb3ab9ed 100644
--- 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'])) {