From 228a225f5b94887250625b03604233dac8ce9338 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews" Date: Sat, 4 Apr 2009 15:46:09 +0000 Subject: [PATCH] - some fixes on yesterdays update --- change_log.txt | 3 + libs/sysplugins/internal.compile_append.php | 56 +++++++++++++++++++ .../method.registerdefaultpluginhandler.php | 4 +- .../method.registerdefaulttemplatehandler.php | 10 ++-- 4 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 libs/sysplugins/internal.compile_append.php diff --git a/change_log.txt b/change_log.txt index be96fe9e..cb7fd67c 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,3 +1,6 @@ +04/04/2009 +- some fixes on yesterdays update + 04/03/2006 - added registerDefaultTemplateHandler methode and functionallity - added registerDefaultPluginHandler methode and functionallity diff --git a/libs/sysplugins/internal.compile_append.php b/libs/sysplugins/internal.compile_append.php new file mode 100644 index 00000000..316739f4 --- /dev/null +++ b/libs/sysplugins/internal.compile_append.php @@ -0,0 +1,56 @@ +compiler = $compiler; + $this->required_attributes = array('var', 'value'); + $this->optional_attributes = array('global', 'nocache', 'index'); + + $_nocache = 'null'; + $_global = 'null'; + // check for nocache attribute before _get_attributes because + // it shall not controll caching of the compiled code, but is a parameter + if (isset($args['nocache'])) { + if ($args['nocache'] == 'true') { + $_nocache = 'true'; + $_nocache_boolean = true; + } + unset($args['nocache']); + } + // check and get attributes + $_attr = $this->_get_attributes($args); + + if (isset($_attr['global']) && $_attr['global'] == 'true') { + $_global = 'true'; + $_global_boolean = true; + } + // compiled output + if (isset($_attr['index'])) { + return "append($_attr[var],array($_attr[index] => $_attr[value]),true,$_nocache,$_global);?>"; + } else { + return "append($_attr[var],$_attr[value],false,$_nocache,$_global);?>"; + } + } +} + +?> diff --git a/libs/sysplugins/method.registerdefaultpluginhandler.php b/libs/sysplugins/method.registerdefaultpluginhandler.php index c32e942b..e172d404 100644 --- a/libs/sysplugins/method.registerdefaultpluginhandler.php +++ b/libs/sysplugins/method.registerdefaultpluginhandler.php @@ -16,7 +16,7 @@ * Registers a default plugin handler */ -class Smarty_Method_registerDefaultPluginhandlerHandler extends Smarty_Internal_Base { +class Smarty_Method_registerDefaultPluginHandler extends Smarty_Internal_Base { /** * Registers a default plugin handler * @@ -27,7 +27,7 @@ class Smarty_Method_registerDefaultPluginhandlerHandler extends Smarty_Internal_ if (is_callable($plugin)) { $this->smarty->default_plugin_handler_func = $plugin; } else { - throw new Exception("Default plugin handler not callable"); + throw new Exception('Default plugin handler "'.$plugin.'" not callable'); } } } diff --git a/libs/sysplugins/method.registerdefaulttemplatehandler.php b/libs/sysplugins/method.registerdefaulttemplatehandler.php index f66b933e..a5577fb9 100644 --- a/libs/sysplugins/method.registerdefaulttemplatehandler.php +++ b/libs/sysplugins/method.registerdefaulttemplatehandler.php @@ -20,14 +20,14 @@ class Smarty_Method_registerDefaultTemplateHandler extends Smarty_Internal_Base /** * Registers a default template handler * - * @param string $ |array $plugin class/methode name + * @param string $ |array $function class/methode name */ - public function execute($plugin) + public function execute($function) { - if (is_callable($plugin)) { - $this->smarty->default_template_handler_func = $plugin; + if (is_callable($function)) { + $this->smarty->default_template_handler_func = $function; } else { - throw new Exception("Default template handler not callable"); + throw new Exception('Default template handler "'.$function.'" not callable'); } } }