mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-06 03:14:27 +02:00
Fixed nested include infinite repeat bug.
This commit is contained in:
3
NEWS
3
NEWS
@@ -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)
|
- significantly improved config_load performance. (Andrei)
|
||||||
- added format attribute to math function. (Monte)
|
- added format attribute to math function. (Monte)
|
||||||
- added html_select_time custom function. (Andrei)
|
- added html_select_time custom function. (Andrei)
|
||||||
|
@@ -456,7 +456,11 @@ 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?>";
|
"\$_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?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
/*======================================================================*\
|
/*======================================================================*\
|
||||||
|
@@ -456,7 +456,11 @@ 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?>";
|
"\$_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?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
/*======================================================================*\
|
/*======================================================================*\
|
||||||
|
Reference in New Issue
Block a user