From cd6c1c2ff87061f3ce347fdb5339c92a6b0d3002 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 13 Oct 2013 12:48:07 +0000 Subject: [PATCH] bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_compile_include.php | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/change_log.txt b/change_log.txt index f6ed0612..298d9a7b 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 13.10.2013 + bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161) + 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) diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 3bd2095c..067bd587 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -135,9 +135,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; - if ($compiler->inheritance) { - $compiler->trigger_template_error(' variable template file names not allow within {block} tags'); - } } // variable compile_id? if (isset($_attr['compile_id'])) { @@ -145,9 +142,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; - if ($compiler->inheritance) { - $compiler->trigger_template_error(' variable compile_id not allow within {block} tags'); - } } } if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {