- bugfix {$smarty.template} and {$smarty.current_dir} did not compile correctly within {block} tags

- bugfix corrected error message on missing template files in extends resource
- bugfix untility compileAllTemplates() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS
This commit is contained in:
uwe.tews@googlemail.com
2010-09-17 18:10:10 +00:00
parent 66752cd790
commit 18bcfa2ba7
6 changed files with 29 additions and 8 deletions
@@ -34,6 +34,8 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
$compiler->nocache = true;
}
}
// set flag for {block} tag
$compiler->smarty->inheritance = true;
// must merge includes
$this->compiler->smarty->merge_compiled_includes = true;
@@ -109,6 +111,8 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
$compiler->smarty->merge_compiled_includes = $saved_data[2];
// $_output content has already nocache code processed
$compiler->suppressNocacheProcessing = true;
// reset flag
$compiler->smarty->inheritance = false;
return $_output;
}
}