diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-23 18:49:37 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-23 18:49:37 -0700 |
| commit | 27fa908233640eed51072fe77e7a9658a331ba20 (patch) | |
| tree | 030a7ab035d6b54e043413eff7088f95971d9429 /include | |
| parent | 3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff) | |
| download | volse-hubzilla-27fa908233640eed51072fe77e7a9658a331ba20.tar.gz volse-hubzilla-27fa908233640eed51072fe77e7a9658a331ba20.tar.bz2 volse-hubzilla-27fa908233640eed51072fe77e7a9658a331ba20.zip | |
patch to allow theme based widgets
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 5 | ||||
| -rwxr-xr-x | include/diaspora.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 3 |
3 files changed, 7 insertions, 2 deletions
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'])) { |