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 too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2013-11-07 19:09:37 +00:00
parent c8996a4085
commit 4e1f7b1568
2 changed files with 3 additions and 3 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 =====
07.11.2013
- bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
28.10.2013 28.10.2013
- bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
- bugfix notice "Trying to get property of non-object" removed (Issue 163) - bugfix notice "Trying to get property of non-object" removed (Issue 163)

3
libs/sysplugins/smarty_internal_compile_include.php
View File

@@ -146,9 +146,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
} }
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) {
$merge_compiled_includes = false; $merge_compiled_includes = false;
if ($compiler->inheritance) {
$compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
}
} }
} }
if ($merge_compiled_includes) { if ($merge_compiled_includes) {