diff options
author | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
commit | 215d615fc3bb9e168e21a78a6319a7971c4d1e9e (patch) | |
tree | ff0af309ef283c48a6f3df5d590068c103d6bf7a /Zotlabs/Render/Comanche.php | |
parent | 979c05b24da0497be582aacaa8b744f692b56ccf (diff) | |
parent | d0956eb39d7a361639f5cd73fb1c3c8463fb1e99 (diff) | |
download | volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.gz volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.bz2 volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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)) |