diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-20 14:09:30 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-20 14:09:30 +0100 |
| commit | 1cfb83f0036e0ea3cfd216331b59e3280085ca13 (patch) | |
| tree | 1fbf9b69c9bbd5fd5ac0ed4e325e29410b7802b8 /include/comanche.php | |
| parent | 628e565a6c5ee52341ba6de0b5ecf6495cbb78f8 (diff) | |
| parent | e2692a4baaf031bd0d9c0893c3762637b1f6b201 (diff) | |
| download | volse-hubzilla-1cfb83f0036e0ea3cfd216331b59e3280085ca13.tar.gz volse-hubzilla-1cfb83f0036e0ea3cfd216331b59e3280085ca13.tar.bz2 volse-hubzilla-1cfb83f0036e0ea3cfd216331b59e3280085ca13.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/comanche.php')
| -rw-r--r-- | include/comanche.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/comanche.php b/include/comanche.php index ef71886f2..1537226ca 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -284,8 +284,13 @@ function comanche_widget($name, $text) { $func = 'widget_' . trim($name); - if((! function_exists($func)) && file_exists('widget/' . trim($name) . '.php')) - require_once('widget/' . trim($name) . '.php'); + if(! function_exists($func)) { + if(file_exists('widget/' . trim($name) . '.php')) + require_once('widget/' . trim($name) . '.php'); + elseif(folder_exists('widget/'. trim($name)) + && (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php'))) + require_once('widget/' . trim($name) . '/' . trim($name) . '.php'); + } else { $theme_widget = $func . '.php'; if((! function_exists($func)) && theme_include($theme_widget)) |