From e9b1f296cb7217b37ac55ed7b2333342a304f295 Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Tue, 10 Mar 2015 18:06:05 +0100
Subject: [PATCH] - bugfix {include ... nocache} with variable file or
 compile_id attribute was not executed in nocache mode.

---
 change_log.txt                                      | 5 ++++-
 libs/sysplugins/smarty_internal_compile_include.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 99440d72..0a4f6d49 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,6 +1,9 @@
  ===== 3.1.22-dev ===== (xx.xx.2015)
+ 10.03.2015
+ - bugfix {include ... nocache} with variable file or compile_id attribute was not executed in nocache mode.
+ 
  12.02.2015
- - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function alreday defined error
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
  
  11.02.2015
  - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
index 603ffb2b..f013f9fc 100644
--- a/libs/sysplugins/smarty_internal_compile_include.php
+++ b/libs/sysplugins/smarty_internal_compile_include.php
@@ -136,7 +136,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         * a call in nocache mode.
         *
         */
-        if ($_attr['caching']) {
+        if ($_attr['nocache'] !== true && $_attr['caching']) {
             $_caching = $_new_caching = (int) $_attr['caching'];
             $call_nocache = true;
         } else {