diff --git a/change_log.txt b/change_log.txt index 0200a394..f6ed0612 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,8 @@ ===== trunk ===== + 04.10.2013 + - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of + template inheritance of 24.08.2013 (forum topic 24585) + 03.10.2013 - bugfix loops using modifier capitalize did eat up memory (issue 159) diff --git a/libs/sysplugins/smarty_internal_compile_extends.php b/libs/sysplugins/smarty_internal_compile_extends.php index aa3d6df3..c60a9dee 100644 --- a/libs/sysplugins/smarty_internal_compile_extends.php +++ b/libs/sysplugins/smarty_internal_compile_extends.php @@ -50,13 +50,6 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase if (strpos($_attr['file'], '$_tmp') !== false) { $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); } - // add tag to call parent template at the end of source - - if ($compiler->has_variable_string || !((substr_count($_attr['file'], '"') == 2 || substr_count($_attr['file'], "'") == 2)) - || substr_count($_attr['file'], '(') != 0 || substr_count($_attr['file'], '$_smarty_tpl->') != 0 - ) { - $compiler->trigger_template_error('variable template file name not allowed', $compiler->lex->taglineno); - } $name = trim($_attr['file'],"\"'"); // create template object