diff --git a/change_log.txt b/change_log.txt index 4e745526..fe71d9ab 100644 --- a/change_log.txt +++ b/change_log.txt @@ -5,6 +5,7 @@ - bugfix a relative {include} in child template blocks failed - bugfix direct setting of $template_dir, $config_dir, $plugins_dir in __construct() of an extended Smarty class created problems +- bugfix error muting was not implemented for cache locking ===== Smarty 3.1.1 ===== 22.09.2011 diff --git a/libs/sysplugins/smarty_internal_cacheresource_file.php b/libs/sysplugins/smarty_internal_cacheresource_file.php index 39c74ea7..896c7a41 100644 --- a/libs/sysplugins/smarty_internal_cacheresource_file.php +++ b/libs/sysplugins/smarty_internal_cacheresource_file.php @@ -227,7 +227,9 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource { } else { clearstatcache(); } + Smarty::muteExpectedErrors(); $t = @filemtime($cached->lock_id); + Smarty::unmuteExpectedErrors(); return $t && (time() - $t < $smarty->locking_timeout); }