Avoid deleting tag files for records added to the cache during clean. (…

…#39)
colinmollenhour · Sep 19, 2023 · 90ad5e7 · 90ad5e7
1 parent a4b5062
commit 90ad5e7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/File.php b/File.php
@@ -434,7 +434,7 @@ protected function _path($id, $parts = false)
         $partsArray = array();
         $root = $this->_options['cache_dir'];
         $prefix = $this->_options['file_name_prefix'];
-        if ($this->_options['hashed_directory_level']>0) {
+        if ($this->_options['hashed_directory_level'] > 0) {
             $root .= $prefix . '--' . substr(md5($id), -$this->_options['hashed_directory_level']) . DIRECTORY_SEPARATOR;
             $partsArray[] = $root;
         }
@@ -469,6 +469,14 @@ protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = a
         if (!is_dir($dir)) {
             return false;
         }
+        if ($mode == 'all' && $dir === $this->_options['cache_dir']) {
+            $glob = glob($this->_tagFile('*'));
+            if ($glob !== false) {
+                foreach ($glob as $tagFile) {
+                    @unlink($tagFile);
+                }
+            }
+        }
         $result = true;
         $glob = @glob($dir . $this->_options['file_name_prefix'] . '--*');
         if ($glob === false) {
@@ -511,11 +519,6 @@ protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = a
                 }
             }
         }
-        if ($mode == 'all') {
-            foreach (glob($this->_tagFile('*')) as $tagFile) {
-                @unlink($tagFile);
-            }
-        }
         return $result;
     }
 
@@ -737,7 +740,7 @@ protected function _filePutContents($file, $string)
      */
     protected function _recursiveMkdirAndChmod($id)
     {
-        if ($this->_options['hashed_directory_level'] <=0) {
+        if ($this->_options['hashed_directory_level'] <= 0) {
             return true;
         }
         $partsArray = $this->_path($id, true);