From 9e5eed4733ecd1c8804841e22810ae8b6858c57f Mon Sep 17 00:00:00 2001
From: "uwe.tews@googlemail.com" <uwe.tews@googlemail.com>
Date: Wed, 2 May 2012 17:19:33 +0000
Subject: [PATCH] - bugfix  {nocache}{block}{plugin}... did produce wrong
 compiled code when caching is disabled (Forum Topic 21572, issue 95)

---
 change_log.txt                                    | 3 +++
 libs/sysplugins/smarty_internal_compile_block.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/change_log.txt b/change_log.txt
index 75f35152..060c7cfc 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
 ===== trunk  =====
+02.05.2012
+- bugfix  {nocache}{block}{plugin}... did produce wrong compiled code when caching is disabled (Forum Topic 21572, issue 95)
+
 12.04.2012
 - bugfix Smarty did eat the linebreak after the <?xml...?> closing tag (Issue 93)
 - bugfix concurrent cache updates could create a warning (Forum Topic 21403)
diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php
index c5349674..3b8ffc64 100644
--- a/libs/sysplugins/smarty_internal_compile_block.php
+++ b/libs/sysplugins/smarty_internal_compile_block.php
@@ -199,7 +199,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
             $compiler->template->has_nocache_code = true;
         }
         foreach($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache) {
+            if ($compiler->nocache  && $compiler->template->caching) {
                 $code = 'nocache';
             } else {
                 $code = $key;