smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 19:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inclusion of dynamic files.

Browse Source
This commit is contained in:
andrey
2001-03-22 18:21:23 +00:00
parent 2e28c7de45
commit 6cf4fe9a33
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Smarty_Compiler.class.php
View File

@@ -434,7 +434,11 @@ class Smarty_Compiler extends Smarty {
$attrs['file'] = $this->_dequote($attrs['file']); $attrs['file'] = $this->_dequote($attrs['file']);
$include_func_name = uniqid("_include_"); $include_func_name = uniqid("_include_");
$include_file_name = $this->compile_dir.'/'.$attrs['file']; if ($attrs['file']{0} == '$')
$include_file_name = '"'.$this->compile_dir.'/".'.$attrs['file'];
else
$include_file_name = '"'.$this->compile_dir.'/'.$attrs['file'].'"';
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'file') continue; if ($arg_name == 'file') continue;
@@ -452,7 +456,7 @@ class Smarty_Compiler extends Smarty {
" include \"\$file_name.php\";\n" . " include \"\$file_name.php\";\n" .
" }\n" . " }\n" .
"}\n" . "}\n" .
"$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; "$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
} }
/*======================================================================*\ /*======================================================================*\

8
libs/Smarty_Compiler.class.php
View File

@@ -434,7 +434,11 @@ class Smarty_Compiler extends Smarty {
$attrs['file'] = $this->_dequote($attrs['file']); $attrs['file'] = $this->_dequote($attrs['file']);
$include_func_name = uniqid("_include_"); $include_func_name = uniqid("_include_");
$include_file_name = $this->compile_dir.'/'.$attrs['file']; if ($attrs['file']{0} == '$')
$include_file_name = '"'.$this->compile_dir.'/".'.$attrs['file'];
else
$include_file_name = '"'.$this->compile_dir.'/'.$attrs['file'].'"';
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'file') continue; if ($arg_name == 'file') continue;
@@ -452,7 +456,7 @@ class Smarty_Compiler extends Smarty {
" include \"\$file_name.php\";\n" . " include \"\$file_name.php\";\n" .
" }\n" . " }\n" .
"}\n" . "}\n" .
"$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; "$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
} }
/*======================================================================*\ /*======================================================================*\