smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix added exception if the default plugin handler did return a not static callback (Forum Topic 20512)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-11-29 17:47:37 +00:00
parent fe68b976e8
commit f14c4bfb9c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
29.11.2011
- bugfix added exception if the default plugin handler did return a not static callback (Forum Topic 20512)
25.11.2011 25.11.2011
- bugfix {html_select_date} and {html_slecet_time} did not default to current time if "time" was not specified - bugfix {html_select_date} and {html_slecet_time} did not default to current time if "time" was not specified
since r4432 (issue 60) since r4432 (issue 60)

7
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -521,14 +521,17 @@ abstract class Smarty_Internal_TemplateCompilerBase {
} }
include_once $script; include_once $script;
} else { } else {
throw new SmartyCompilerException("Plugin or modifer script file $script not found"); $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
} }
} }
if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
$this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
}
if (is_callable($callback)) { if (is_callable($callback)) {
$this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array()); $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
return true; return true;
} else { } else {
throw new SmartyCompilerException("Function for plugin or modifier $tag not callable"); $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
} }
} }
return false; return false;