diff options
| -rwxr-xr-x | boot.php | 1 | ||||
| -rw-r--r-- | include/comanche.php | 5 | ||||
| -rwxr-xr-x | include/diaspora.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 |
5 files changed, 8 insertions, 4 deletions
@@ -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 |