diff --git a/change_log.txt b/change_log.txt index d6affe73..115f4786 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 26.01.2014 + - bugfix undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762) + 18.01.2014 - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group) diff --git a/libs/sysplugins/smarty_internal_compile_nocache.php b/libs/sysplugins/smarty_internal_compile_nocache.php index a0e15385..f4e623c6 100644 --- a/libs/sysplugins/smarty_internal_compile_nocache.php +++ b/libs/sysplugins/smarty_internal_compile_nocache.php @@ -32,11 +32,8 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase if ($_attr['nocache'] === true) { $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); } - if ($compiler->template->caching) { // enter nocache mode - $this->openTag($compiler, 'nocache', $compiler->nocache); $compiler->nocache = true; - } // this tag does not return compiled code $compiler->has_code = false; @@ -65,10 +62,8 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase public function compile($args, $compiler) { $_attr = $this->getAttributes($compiler, $args); - if ($compiler->template->caching) { - // restore old nocache mode - $compiler->nocache = $this->closeTag($compiler, 'nocache'); - } + // leave nocache mode + $compiler->nocache = false; // this tag does not return compiled code $compiler->has_code = false;