From 85b218156e66e7747394d229381cac3e10875262 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sat, 20 Nov 2010 20:36:06 -0700 Subject: [PATCH] Fix GC for file cache driver --- framework/Cache/lib/Horde/Cache/Storage/File.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/Cache/lib/Horde/Cache/Storage/File.php b/framework/Cache/lib/Horde/Cache/Storage/File.php index 9f0c7ee9d..47782be4c 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/File.php +++ b/framework/Cache/lib/Horde/Cache/Storage/File.php @@ -94,17 +94,18 @@ class Horde_Cache_Storage_File extends Horde_Cache_Storage_Base $c_time = time(); - foreach ($it as $key => $val) { + foreach ($it as $val) { if (!$val->isDir() && - (strpos($val->getFilename(), $this->_params['prefix']) === 0)) { - $d_time = isset($excepts[$key]) - ? $excepts[$key] + ($fname = $val->getFilename()) && + (strpos($fname, $this->_params['prefix']) === 0)) { + $d_time = isset($excepts[$fname]) + ? $excepts[$fname] : $this->_params['lifetime']; if (!empty($d_time) && - (($c_time - $d_time) > filemtime($key))) { - @unlink($key); - unset($excepts[$key]); + (($c_time - $d_time) > filemtime($val->getPathname()))) { + @unlink($val->getPathname()); + unset($excepts[$fname]); } } } -- 2.11.0