mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

upgrade to Smarty-3.1.6

Browse Source
This commit is contained in:
Ian
2011-12-01 17:04:13 +01:00
parent 7e0cdf30af
commit f890b4139a
28 changed files with 663 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -140,7 +140,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
// save template object in compiler class
$this->template = $template;
// reset has noche code flag
$this->template->has_nocache_code = false;
$this->template->has_nocache_code = false;
$this->smarty->_current_file = $saved_filepath = $this->template->source->filepath;
// template header code
$template_header = '';
@@ -521,14 +521,17 @@ abstract class Smarty_Internal_TemplateCompilerBase {
}
include_once $script;
} 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)) {
$this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
return true;
} 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;
@@ -569,6 +572,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
} else {
$_output = $content;
}
$this->modifier_plugins = array();
$this->suppressNocacheProcessing = false;
$this->tag_nocache = false;
return $_output;