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

- fix on merging compiled templates with nocache sections in nocache includes

Browse Source
This commit is contained in:
Uwe.Tews
2009-11-14 16:20:18 +00:00
parent 6154717b48
commit 5b6050bf54
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -3,6 +3,7 @@
- bugfix modifiers on registered object tags - bugfix modifiers on registered object tags
- fixed locaion where outputfilters are running - fixed locaion where outputfilters are running
- fixed config file definitions at EOF - fixed config file definitions at EOF
- fix on merging compiled templates with nocache sections in nocache includes
11/12/2009 11/12/2009
- fixed variable filenames in {include_php} and {insert} - fixed variable filenames in {include_php} and {insert}

5
libs/sysplugins/smarty_internal_compile_include.php
View File

@@ -100,7 +100,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
} }
} }
// default for included templates // default for included templates
if ($compiler->template->caching) { if ($this->compiler->template->caching && !$this->compiler->nocache) {
$_caching = SMARTY_CACHING_LIFETIME_CURRENT; $_caching = SMARTY_CACHING_LIFETIME_CURRENT;
} else { } else {
$_caching = SMARTY_CACHING_OFF; $_caching = SMARTY_CACHING_OFF;
@@ -117,6 +117,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
if (isset($_attr['nocache'])) { if (isset($_attr['nocache'])) {
if ($_attr['nocache'] == 'true') { if ($_attr['nocache'] == 'true') {
$this->compiler->tag_nocache = true; $this->compiler->tag_nocache = true;
$_caching = SMARTY_CACHING_OFF;
} }
} }
if (isset($_attr['caching'])) { if (isset($_attr['caching'])) {
@@ -151,7 +152,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
if (isset($_assign)) { if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate()); ?>"; $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate()); ?>";
} else { } else {
if ($has_compiled_template) { if ($has_compiled_template && !($compiler->template->caching && ($this->compiler->tag_nocache || $this->compiler->nocache))) {
$_output .= " \$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n"; $_output .= " \$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n";
$_output .= $compiled_tpl . "<?php /* End of included template \"" . $tpl->getTemplateFilepath() . "\" */ ?>"; $_output .= $compiled_tpl . "<?php /* End of included template \"" . $tpl->getTemplateFilepath() . "\" */ ?>";
$_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>"; $_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>";