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

Fixed nested include infinite repeat bug.

Browse Source
This commit is contained in:
andrey
2001-03-23 20:02:13 +00:00
parent cff1ecc414
commit cf24bf8717
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -1,4 +1,5 @@
- added optional HTML header to output (Monte)
- fixed a bug that caused some nested includes to loop infinitely. (Andrei)
- added optional HTML header to output. (Monte)
- significantly improved config_load performance. (Andrei)
- added format attribute to math function. (Monte)
- added html_select_time custom function. (Andrei)

6
Smarty_Compiler.class.php
View File

@@ -456,7 +456,11 @@ class Smarty_Compiler extends Smarty {
" include \"\$file_name.php\";\n" .
" }\n" .
"}\n" .
"$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
"\$_smarty_defined_vars = get_defined_vars();\n" .
"unset(\$_smarty_defined_vars['file_name']);\n" .
"unset(\$_smarty_defined_vars['def_vars']);\n" .
"unset(\$_smarty_defined_vars['include_vars']);\n" .
"$include_func_name($include_file_name, \$_smarty_defined_vars, array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
}
/*======================================================================*\

6
libs/Smarty_Compiler.class.php
View File

@@ -456,7 +456,11 @@ class Smarty_Compiler extends Smarty {
" include \"\$file_name.php\";\n" .
" }\n" .
"}\n" .
"$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
"\$_smarty_defined_vars = get_defined_vars();\n" .
"unset(\$_smarty_defined_vars['file_name']);\n" .
"unset(\$_smarty_defined_vars['def_vars']);\n" .
"unset(\$_smarty_defined_vars['include_vars']);\n" .
"$include_func_name($include_file_name, \$_smarty_defined_vars, array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
}
/*======================================================================*\