- merge only compiled subtemplates into the compiled code of the main template

This commit is contained in:
Uwe.Tews
2009-10-26 20:36:26 +00:00
parent 6c7c18d79f
commit eddbf62d03
2 changed files with 4 additions and 1 deletions

View File

@@ -1,3 +1,6 @@
10/26/2009
- merge only compiled subtemplates into the compiled code of the main template
10/24/2009
- fixed nocache vars at internal block tags
- fixed merging of recursive includes

View File

@@ -36,7 +36,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
eval("\$tmp = $include_file;");
if ($this->compiler->template->template_resource != $tmp) {
$tpl = $compiler->smarty->createTemplate ($tmp, $compiler->template->cache_id, $compiler->template->compile_id, $compiler->template);
if ($tpl->isExisting()) {
if ($tpl->usesCompiler() && $tpl->isExisting()) {
do {
$must_compile = false;
$prop = array();