From d1986c6cffc1cbcd9da58aaa3dafc39a6c705d09 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews" Date: Fri, 7 May 2010 13:08:46 +0000 Subject: [PATCH] - bugfix on {insert} --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_templatecompilerbase.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index 3c88838f..f17cf33a 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,3 +1,6 @@ +07/05/2010 +- bugfix on {insert} + 06/05/2010 - bugfix when merging compiled templates and objects are passed as parameter of the {include} tag diff --git a/libs/sysplugins/smarty_internal_templatecompilerbase.php b/libs/sysplugins/smarty_internal_templatecompilerbase.php index d11c2abc..37cd1815 100644 --- a/libs/sysplugins/smarty_internal_templatecompilerbase.php +++ b/libs/sysplugins/smarty_internal_templatecompilerbase.php @@ -356,7 +356,6 @@ class Smarty_Internal_TemplateCompilerBase { // generate replacement code if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) { - $this->tag_nocache = false; $this->template->has_nocache_code = true; $_output = str_replace("'", "\'", $content); $_output = "nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>"; @@ -376,6 +375,7 @@ class Smarty_Internal_TemplateCompilerBase { $_output = $content; } $this->suppressNocacheProcessing = false; + $this->tag_nocache = false; return $_output; } /**