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

- bugfix on {insert}

Browse Source
This commit is contained in:
Uwe.Tews
2010-05-07 13:08:46 +00:00
parent 98753671e3
commit d1986c6cff
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
07/05/2010
- bugfix on {insert}
06/05/2010 06/05/2010
- bugfix when merging compiled templates and objects are passed as parameter of the {include} tag - bugfix when merging compiled templates and objects are passed as parameter of the {include} tag

2
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -356,7 +356,6 @@ class Smarty_Internal_TemplateCompilerBase {
// generate replacement code // generate replacement code
if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) { ($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) {
$this->tag_nocache = false;
$this->template->has_nocache_code = true; $this->template->has_nocache_code = true;
$_output = str_replace("'", "\'", $content); $_output = str_replace("'", "\'", $content);
$_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>"; $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>";
@@ -376,6 +375,7 @@ class Smarty_Internal_TemplateCompilerBase {
$_output = $content; $_output = $content;
} }
$this->suppressNocacheProcessing = false; $this->suppressNocacheProcessing = false;
$this->tag_nocache = false;
return $_output; return $_output;
} }
/** /**