- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag.

This commit is contained in:
Uwe.Tews
2010-05-11 17:01:08 +00:00
parent 6e97a8a393
commit 3197470ca5
2 changed files with 9 additions and 1 deletions

View File

@@ -1,5 +1,6 @@
11/05/2010
- bugfix make sure that the cache resource is loaded in all conditions when template methods getCached... are called externally
- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag.
10/05/2010
- bugfix on {foreach} and {for} optimizations of 27/04/2010

View File

@@ -110,7 +110,14 @@ class Smarty_Internal_TemplateCompilerBase {
$this->has_code = true;
$this->has_output = false;
// compile the smarty tag (required compile classes to compile the tag are autoloaded)
if (($_output = $this->callTagCompiler($tag, $args)) !== false) {
if (($_output = $this->callTagCompiler($tag, $args)) === false) {
if (isset($this->smarty->template_functions[$tag])) {
// template defined by {template} tag
$args['name'] = "'" . $tag . "'";
$_output = $this->callTagCompiler('call', $args);
}
}
if ($_output !== false) {
if ($_output !== true) {
// did we get compiled code
if ($this->has_code) {