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

Conflicts:
	include/diaspora.php

6 files changed, 10 insertions, 6 deletions

diff --git a/boot.php b/boot.php
index 45e071003..ff6eeccf8 100755
--- a/boot.php
+++ b/boot.php
@@ -2009,7 +2009,6 @@ function load_pdl(&$a) {
 
 		if((! $s) && (($p = theme_include($n)) != ''))
 			$s = @file_get_contents($p);
-
 		if($s) {
 			comanche_parser($a, $s);
 			$a->pdl = $s;
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'])) {
diff --git a/mod/events.php b/mod/events.php
index 02c453562..c834bf59b 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -148,10 +148,9 @@ function events_post(&$a) {
 			}
 		}
 		else {
-			// Note: do not set `private` field for self-only events. It will
-			// keep even you from seeing them!
 			$str_contact_allow = '<' . $channel['channel_hash'] . '>';
 			$str_group_allow = $str_contact_deny = $str_group_deny = '';
+			$private_event = true;
 		}
 	}
 
diff --git a/version.inc b/version.inc
index 4b4237878..73b533b5e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-21.1100
+2015-07-23.1102