This commit is contained in:
uwe.tews@googlemail.com
2012-03-30 14:21:16 +00:00
parent 0364e35e7d
commit 8d60164201
2 changed files with 5 additions and 2 deletions

View File

@@ -1,4 +1,7 @@
===== trunk =====
30.03.2012
- bugfix template inheritance did not throw exception when a parent template was deleted (issue 90)
27.03.2012
- bugfix prefilter did run multiple times on inline subtemplates compiled into several main templates (Forum Topic 21325)
- bugfix implement Smarty2's behaviour of variables assigned by reference in SmartyBC. {assign} will affect all references.

View File

@@ -442,7 +442,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$mtime = $this->source->timestamp;
} else {
// file and php types can be checked without loading the respective resource handlers
$mtime = filemtime($_file_to_check[0]);
$mtime = @filemtime($_file_to_check[0]);
}
} elseif ($_file_to_check[2] == 'string') {
continue;
@@ -450,7 +450,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
$mtime = $source->timestamp;
}
if ($mtime > $_file_to_check[1]) {
if (!$mtime || $mtime > $_file_to_check[1]) {
$is_valid = false;
break;
}