From 3d0b7663e23f0541380298e800e5298793b64612 Mon Sep 17 00:00:00 2001
From: "Uwe.Tews" <uwe.tews@localhost>
Date: Tue, 14 Apr 2009 10:31:02 +0000
Subject: [PATCH] - fixed compile_id handling on {include} tags

---
 change_log.txt                               | 1 +
 libs/sysplugins/internal.compile_include.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 7f7a202d..dbe155cc 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,5 @@
 04/14/2009
+- fixed compile_id handling on {include} tags
 - fixed append/prepend attributes in {block} tag
 - added  {if  'expression' is in 'array'}  syntax
 - use crc32 as hash for compiled config files.
diff --git a/libs/sysplugins/internal.compile_include.php b/libs/sysplugins/internal.compile_include.php
index 3513727a..9d9ea212 100644
--- a/libs/sysplugins/internal.compile_include.php
+++ b/libs/sysplugins/internal.compile_include.php
@@ -73,7 +73,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
             unset ($_template);
         } 
         // create template object
-        $_output = "<?php \$_template = new Smarty_Template ($include_file, \$_smarty_tpl);"; 
+        $_output = "<?php \$_template = new Smarty_Template ($include_file, \$_smarty_tpl, \$_smarty_tpl->cache_id,  \$_smarty_tpl->compile_id);"; 
         // delete {include} standard attributes
         unset($_attr['file'], $_attr['assign'], $_attr['caching_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope']); 
         // remaining attributes must be assigned as smarty variable
@@ -98,11 +98,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
         } 
         // was there an assign attribute
         if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template, null, \$_smarty_tpl->cache_id,  \$_smarty_tpl->compile_id)); ?>";
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template); ?>";
         } else {
-            $_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template, null, \$_smarty_tpl->cache_id,  \$_smarty_tpl->compile_id); ?>";
+            $_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template); ?>";
         } 
-        if ($_parent_scope != '0') {
+        if ($_parent_scope != SMARTY_LOCAL_SCOPE) {
             $_output .= "<?php \$_template->updateParentVariables($_parent_scope); ?>";
         } 
         return $_output;