- bugfix in nocache sections {include} must not cache the subtemplate

This commit is contained in:
Uwe.Tews
2010-08-05 21:13:29 +00:00
parent 08874b0965
commit 09dfffd2a0
2 changed files with 6 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
05/08/2010 05/08/2010
- added plugin type modifiercompiler to produce compiled modifier code - added plugin type modifiercompiler to produce compiled modifier code
- changed standard modifier plugins to the compiling versions whenever possible - changed standard modifier plugins to the compiling versions whenever possible
- bugfix in nocache sections {include} must not cache the subtemplate
02/08/2010 02/08/2010
- bugfix strip did not work correctly in conjunction with comment lines - bugfix strip did not work correctly in conjunction with comment lines

View File

@@ -86,9 +86,12 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
$_parent_scope = SMARTY_GLOBAL_SCOPE; $_parent_scope = SMARTY_GLOBAL_SCOPE;
} }
} }
$_caching = 'null'; $_caching = 'null';
if ($this->compiler->nocache || $this->compiler->tag_nocache) {
$_caching = SMARTY_CACHING_OFF;
}
// default for included templates // default for included templates
if ($this->compiler->template->caching && !$this->compiler->nocache) { if ($this->compiler->template->caching && !$this->compiler->nocache && !$this->compiler->tag_nocache) {
$_caching = 9999; $_caching = 9999;
} }
/* /*