diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
| commit | c363fc71eb054ffa615bdfe03c645a9ab946379e (patch) | |
| tree | 564dbaa2dac8bb13260704730a8e5483084baa67 /include/comanche.php | |
| parent | b96f09bb3aeee403038755ab5f6e6b53654cb145 (diff) | |
| parent | 9f3ea71d5d9e1e42d1d1e44a8070d90814962ad2 (diff) | |
| download | volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.gz volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.bz2 volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/comanche.php')
| -rw-r--r-- | include/comanche.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/comanche.php b/include/comanche.php index 9585a6578..ef71886f2 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -282,15 +282,16 @@ function comanche_widget($name, $text) { } } - if(file_exists('widget/' . trim($name) . '.php')) + $func = 'widget_' . trim($name); + + if((! function_exists($func)) && file_exists('widget/' . trim($name) . '.php')) require_once('widget/' . trim($name) . '.php'); else { - $theme_widget = 'widget_' . trim($name) . '.php'; - if(theme_include($theme_widget)) + $theme_widget = $func . '.php'; + if((! function_exists($func)) && theme_include($theme_widget)) require_once(theme_include($theme_widget)); } - $func = 'widget_' . trim($name); if (function_exists($func)) return $func($vars); } |