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 inclusion again.

Browse Source
This commit is contained in:
andrey
2001-04-30 14:13:47 +00:00
parent baea48b9cd
commit 10542f8665
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Smarty.class.php
View File

@@ -699,7 +699,7 @@ class Smarty
&$_smarty_config_parent)
{
$this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
extract($_smarty_include_vars);
extract($this->_tpl_vars);
$this->_process_template($_smarty_include_tpl_file, $compile_path);
include($compile_path);

6
Smarty_Compiler.class.php
View File

@@ -363,9 +363,7 @@ class Smarty_Compiler extends Smarty {
foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'file') {
$_smarty_include_tpl_file = $this->_dequote($arg_value);
if ($_smarty_include_tpl_file{0} != '$')
$_smarty_include_tpl_file = '"' . $_smarty_include_tpl_file . '"';
$_smarty_include_tpl_file = $arg_value;
continue;
}
if (is_bool($arg_value))
@@ -378,7 +376,7 @@ class Smarty_Compiler extends Smarty {
"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_defined_vars;\n" .
"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
"unset(\$_smarty_tpl_vars); ?>";
}

2
libs/Smarty.class.php
View File

@@ -699,7 +699,7 @@ class Smarty
&$_smarty_config_parent)
{
$this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
extract($_smarty_include_vars);
extract($this->_tpl_vars);
$this->_process_template($_smarty_include_tpl_file, $compile_path);
include($compile_path);

6
libs/Smarty_Compiler.class.php
View File

@@ -363,9 +363,7 @@ class Smarty_Compiler extends Smarty {
foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'file') {
$_smarty_include_tpl_file = $this->_dequote($arg_value);
if ($_smarty_include_tpl_file{0} != '$')
$_smarty_include_tpl_file = '"' . $_smarty_include_tpl_file . '"';
$_smarty_include_tpl_file = $arg_value;
continue;
}
if (is_bool($arg_value))
@@ -378,7 +376,7 @@ class Smarty_Compiler extends Smarty {
"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_defined_vars;\n" .
"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
"unset(\$_smarty_tpl_vars); ?>";
}