[mms] Fix lifetime usage in the file driver.

framework/Cache/lib/Horde/Cache/Storage/File.php

@@ -91,12 +91,8 @@ public function __destruct()
         }
 
         foreach ($this->_getCacheFiles() as $fname => $pname) {
-            $d_time = isset($excepts[$fname])
-                ? $excepts[$fname]
-                : $this->_params['lifetime'];
-
-            if (!empty($d_time) &&
-                (($c_time - $d_time) > filemtime($pname))) {
+            if (!empty($excepts[$fname]) &&
+                (($c_time - $excepts[$fname]) > filemtime($pname))) {
                 @unlink($pname);
                 unset($excepts[$fname]);
             }
@@ -143,12 +139,12 @@ public function set($key, $data, $lifetime = 0)
 
         @rename($tmp_file, $filename);
 
-        if (($lifetime != $this->_params['lifetime']) &&
+        if ($lifetime &&
             ($fp = @fopen($this->_params['dir'] . '/' . self::GC_FILE, 'a'))) {
             // This may result in duplicate entries in GC_FILE, but we
             // will take care of these whenever we do GC and this is quicker
             // than having to check every time we access the file.
-            fwrite($fp, $filename . "\t" . (empty($lifetime) ? 0 : time() + $lifetime) . "\n");
+            fwrite($fp, $filename . "\t" . (time() + $lifetime) . "\n");
             fclose($fp);
         }
     }

framework/Cache/package.xml

@@ -27,6 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix lifetime usage in the file driver.
 * [mms] Add &apos;no_gc&apos; parameter to the Horde_Cache_Storage_File driver.
  </notes>
  <contents>
@@ -532,6 +533,7 @@ Initial packaging.
    <date>2013-10-08</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix lifetime usage in the file driver.
 * [mms] Add &apos;no_gc&apos; parameter to the Horde_Cache_Storage_File driver.
    </notes>
   </release>