- bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)

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

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) {
$merge_compiled_includes = false;
if ($compiler->inheritance) {
$compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
}
}
}
if ($merge_compiled_includes) {