diff options
| author | mrjive <mrjive@mrjive.it> | 2018-01-16 11:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 11:45:01 +0100 |
| commit | e81949bb095448881ce83605a50454d0c3c40782 (patch) | |
| tree | bd15059a020152b5dc59c265e22a27251efe0de4 /Zotlabs/Render/Comanche.php | |
| parent | b4f8f4df7bc5cc8a74240506cd536224cb31e114 (diff) | |
| parent | 9aadcb0bd40a8f773dc164f7dadc8c238fff9954 (diff) | |
| download | volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.gz volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.bz2 volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.zip | |
Merge pull request #7 from redmatrix/dev
Dev
Diffstat (limited to 'Zotlabs/Render/Comanche.php')
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index cd06e11a8..fb400b6fe 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -534,7 +534,12 @@ class Comanche { require_once('widget/' . $clsname . '/' . $clsname . '.php'); elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php')) require_once('Zotlabs/Widget/' . $clsname . '.php'); - + else { + $pth = theme_include($clsname . '.php'); + if($pth) { + require_once($pth); + } + } if(class_exists($nsname)) { $x = new $nsname; $f = 'widget'; @@ -550,11 +555,13 @@ class Comanche { require_once('widget/' . trim($name) . '.php'); elseif(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)) - require_once(theme_include($theme_widget)); + + if(! function_exists($func)) { + $theme_widget = $func . '.php'; + if(theme_include($theme_widget)) { + require_once(theme_include($theme_widget)); + } + } } if(function_exists($func)) |