From ec358c7a621726cb19f9ee3fd8ab957e796234a2 Mon Sep 17 00:00:00 2001
From: andrey <andrey@localhost>
Date: Thu, 21 Dec 2000 20:35:08 +0000
Subject: [PATCH] Fix access to template variables.

---
 Smarty.class.php      | 6 +++---
 libs/Smarty.class.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Smarty.class.php b/Smarty.class.php
index 146c7833..f447944d 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -541,13 +541,13 @@ class Smarty
 			}
 
 			return 	"<?php\n" .
-					"function $include_func_name(\$file_name, \$include_vars)\n" .
+					"function $include_func_name(\$file_name, \$tpl_vars, \$include_vars)\n" .
 					"{\n" .
-					"	extract(\$GLOBALS);\n" .
+					"	extract(\$tpl_vars);\n" .
 					"	extract(\$include_vars);\n" .
 					"	include \"\$file_name\";\n" .
 					"}\n" .
-					"$include_func_name(\"$include_file_name\", array(".implode(',', (array)$arg_list)."));\n?>\n";
+					"$include_func_name(\"$include_file_name\", \$this->_tpl_vars, array(".implode(',', (array)$arg_list)."));\n?>\n";
 		} else
 			 return '<?php include "'.$this->template_dir.$this->compile_dir_ext.'/'.$attrs['file'].'"; ?>';
 	}
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 146c7833..f447944d 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -541,13 +541,13 @@ class Smarty
 			}
 
 			return 	"<?php\n" .
-					"function $include_func_name(\$file_name, \$include_vars)\n" .
+					"function $include_func_name(\$file_name, \$tpl_vars, \$include_vars)\n" .
 					"{\n" .
-					"	extract(\$GLOBALS);\n" .
+					"	extract(\$tpl_vars);\n" .
 					"	extract(\$include_vars);\n" .
 					"	include \"\$file_name\";\n" .
 					"}\n" .
-					"$include_func_name(\"$include_file_name\", array(".implode(',', (array)$arg_list)."));\n?>\n";
+					"$include_func_name(\"$include_file_name\", \$this->_tpl_vars, array(".implode(',', (array)$arg_list)."));\n?>\n";
 		} else
 			 return '<?php include "'.$this->template_dir.$this->compile_dir_ext.'/'.$attrs['file'].'"; ?>';
 	}