harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent function name re-declaration in widget space

Browse Source
This commit is contained in:
redmatrix 2015-12-02 18:25:09 -08:00
parent 8dd4270a6a
commit ed5405d4f7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/comanche.php
View File

@ -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'); require_once('widget/' . trim($name) . '.php');
else { else {
$theme_widget = 'widget_' . trim($name) . '.php'; $theme_widget = $func . '.php';
if(theme_include($theme_widget)) if((! function_exists($func)) && theme_include($theme_widget))
require_once(theme_include($theme_widget)); require_once(theme_include($theme_widget));
} }
$func = 'widget_' . trim($name);
if (function_exists($func)) if (function_exists($func))
return $func($vars); return $func($vars);
} }