diff options
| author | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
|---|---|---|
| committer | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
| commit | a75c61d71efebf43713026200aa0f513bd7eef09 (patch) | |
| tree | 909048adeaa329813e2530d43626ed3bd711bc25 /Zotlabs/Render/Comanche.php | |
| parent | 481ecee9e87342ca7a1217395085e95d1a3b61ea (diff) | |
| parent | 0d0f73fb67bbfcc53058cefded85ac36f951c7a7 (diff) | |
| download | volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.gz volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.bz2 volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Render/Comanche.php')
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 5ce05243b..230c2455e 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -572,7 +572,7 @@ 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'); - + if(! function_exists($func)) { $theme_widget = $func . '.php'; if(theme_include($theme_widget)) { @@ -640,7 +640,8 @@ class Comanche { $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $s = str_replace($mtch[0],$this->widget(trim($mtch[1]),$mtch[2]),$s); + + $s = str_replace((string)$mtch[0], (string)$this->widget(trim((string)$mtch[1]), (string)$mtch[2]), $s); } } |