From 5c52120fb4a320d71dd2d7b1967d824848c04120 Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 22 Jul 2015 09:34:32 +0200 Subject: [PATCH 1/3] make content filter by language work for excludes --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From 27fa908233640eed51072fe77e7a9658a331ba20 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 23 Jul 2015 18:49:37 -0700 Subject: [PATCH 2/3] patch to allow theme based widgets --- boot.php | 1 - include/comanche.php | 5 +++++ include/diaspora.php | 1 - include/zot.php | 3 ++- version.inc | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index eb678853d..53a3aebee 100755 --- a/boot.php +++ b/boot.php @@ -2051,7 +2051,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 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'])) { 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 From 908da4589dc4961c07d049c97bcfd59bc2973c89 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 23 Jul 2015 21:02:41 -0700 Subject: [PATCH 3/3] event privacy issue --- mod/events.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index fa00970b4..a3540ab0a 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; } }