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

bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2013-10-13 12:48:07 +00:00
parent 51453d196b
commit cd6c1c2ff8
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
13.10.2013
bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161)
04.10.2013 04.10.2013
- bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of
template inheritance of 24.08.2013 (forum topic 24585) template inheritance of 24.08.2013 (forum topic 24585)

6
libs/sysplugins/smarty_internal_compile_include.php
View File

@@ -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 || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0
) { ) {
$merge_compiled_includes = false; $merge_compiled_includes = false;
if ($compiler->inheritance) {
$compiler->trigger_template_error(' variable template file names not allow within {block} tags');
}
} }
// variable compile_id? // variable compile_id?
if (isset($_attr['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 || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
) { ) {
$merge_compiled_includes = false; $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) { if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {