smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-03 18:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix passing config vars to included files.

Browse Source
This commit is contained in:
andrey
2001-04-30 16:07:55 +00:00
parent 10542f8665
commit 46a8474a82
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Smarty.class.php
View File

@@ -698,9 +698,10 @@ class Smarty
function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars,
&$_smarty_config_parent)
{
$_smarty_config = $_smarty_config_parent;
$this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
extract($this->_tpl_vars);
$this->_process_template($_smarty_include_tpl_file, $compile_path);
include($compile_path);
}

2
Smarty_Compiler.class.php
View File

@@ -373,8 +373,6 @@ class Smarty_Compiler extends Smarty {
return "<?php " .
"\$_smarty_tpl_vars = \$this->_tpl_vars;\n" .
"unset(\$_smarty_defined_vars['_smarty_include_tpl_file']);\n" .
"unset(\$_smarty_defined_vars['_smarty_include_vars']);\n" .
"\$this->_smarty_include(".$_smarty_include_tpl_file.", array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n" .
"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
"unset(\$_smarty_tpl_vars); ?>";

3
libs/Smarty.class.php
View File

@@ -698,9 +698,10 @@ class Smarty
function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars,
&$_smarty_config_parent)
{
$_smarty_config = $_smarty_config_parent;
$this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
extract($this->_tpl_vars);
$this->_process_template($_smarty_include_tpl_file, $compile_path);
include($compile_path);
}

2
libs/Smarty_Compiler.class.php
View File

@@ -373,8 +373,6 @@ class Smarty_Compiler extends Smarty {
return "<?php " .
"\$_smarty_tpl_vars = \$this->_tpl_vars;\n" .
"unset(\$_smarty_defined_vars['_smarty_include_tpl_file']);\n" .
"unset(\$_smarty_defined_vars['_smarty_include_vars']);\n" .
"\$this->_smarty_include(".$_smarty_include_tpl_file.", array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n" .
"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
"unset(\$_smarty_tpl_vars); ?>";