smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2026-05-05 12:14:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
libs/sysplugins/smarty_internal_resource_extends.php
+3 -3
View File
@@ -55,6 +55,9 @@ class Smarty_Internal_Resource_Extends {
$_files = explode('|', $_template->resource_name);
foreach ($_files as $_file) {
$_filepath = $_template->buildTemplateFilepath ($_file);
if ($_filepath === false) {
throw new SmartyException("Unable to load template 'file : {$_file}'");
}
if ($_filepath !== false) {
if ($_template->security) {
$_template->smarty->security_handler->isTrustedResourceDir($_filepath);
@@ -90,9 +93,6 @@ class Smarty_Internal_Resource_Extends {
$_files = array_reverse($this->allFilepaths);
foreach ($_files as $_filepath) {
// read template file
if ($_filepath === false) {
throw new SmartyException("Unable to load template 'file : {$_file}'");
}
if ($_filepath != $_files[0]) {
$_template->properties['file_dependency'][sha1($_filepath)] = array($_filepath, filemtime($_filepath));
}