From 5c52120fb4a320d71dd2d7b1967d824848c04120 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Wed, 22 Jul 2015 09:34:32 +0200
Subject: make content filter by language work for excludes

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 5e84944a4..fdcae3a6c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3383,7 +3383,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);
-- 
cgit v1.2.3


From 27fa908233640eed51072fe77e7a9658a331ba20 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Thu, 23 Jul 2015 18:49:37 -0700
Subject: patch to allow theme based widgets

---
 include/comanche.php | 5 +++++
 include/diaspora.php | 1 -
 include/zot.php      | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/comanche.php b/include/comanche.php
index cb46985eb..49b910bdb 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/diaspora.php b/include/diaspora.php
index cf8d89023..79d3909ca 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1009,7 +1009,6 @@ function diaspora_post($importer,$xml,$msg) {
 		return 202;
 	}
 
-
 	$result = item_store($datarray);
 	return;
 
diff --git a/include/zot.php b/include/zot.php
index 95de349fe..a677da808 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1277,7 +1277,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'])) {
-- 
cgit v1.2.3