smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-10-17 22:45:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix on nocache {block} tags in parent templates

Browse Source
This commit is contained in:
Uwe.Tews
2010-01-09 19:23:35 +00:00
parent 6c020763a8
commit a3459b2e3a
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -12,6 +12,10 @@
* Main compiler class
*/
class Smarty_Internal_TemplateCompilerBase {
// hash for nocache sections
private $nocache_hash = null;
// suppress generation of nocache code
public $suppressNocacheProcessing = false;
// compile tag objects
static $_tag_objects = array();
// tag stack
@@ -20,8 +24,6 @@ class Smarty_Internal_TemplateCompilerBase {
public $template = null;
// required plugins
public $required_plugins_call = array();
// hash for nocache sections
private $nocache_hash = null;
/**
* Initialize compiler
@@ -331,10 +333,10 @@ class Smarty_Internal_TemplateCompilerBase {
public function processNocacheCode ($content, $is_code)
{
// If the template is not evaluated and we have a nocache section and or a nocache tag
if ($is_code) {
if ($is_code && !empty($content)) {
// generate replacement code
if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching &&
($this->nocache || $this->tag_nocache)) {
if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) {
$this->tag_nocache = false;
$this->template->has_nocache_code = true;
$_output = str_replace("'", "\'", $content);
@@ -354,6 +356,7 @@ class Smarty_Internal_TemplateCompilerBase {
} else {
$_output = $content;
}
$this->suppressNocacheProcessing = false;
return $_output;
}
/**