smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-01-26 20:11:19 +00:00
parent 290dd3f73f
commit 0e03ba5b61
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
26.01.2014
- bugfix undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
18.01.2014 18.01.2014
- bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group) - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)

9
libs/sysplugins/smarty_internal_compile_nocache.php
View File

@@ -32,11 +32,8 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
if ($_attr['nocache'] === true) { if ($_attr['nocache'] === true) {
$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
} }
if ($compiler->template->caching) {
// enter nocache mode // enter nocache mode
$this->openTag($compiler, 'nocache', $compiler->nocache);
$compiler->nocache = true; $compiler->nocache = true;
}
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;
@@ -65,10 +62,8 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
if ($compiler->template->caching) { // leave nocache mode
// restore old nocache mode $compiler->nocache = false;
$compiler->nocache = $this->closeTag($compiler, 'nocache');
}
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;