? 569436_cacheflush5.patch
Index: cacherouter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/cacherouter.inc,v
retrieving revision 1.2.6.12
diff -u -p -r1.2.6.12 cacherouter.inc
--- cacherouter.inc	3 Sep 2009 11:12:40 -0000	1.2.6.12
+++ cacherouter.inc	28 Jan 2010 17:54:47 -0000
@@ -56,16 +56,16 @@ function cache_clear_all($key = NULL, $b
       // cached data that was cached before the timestamp.
       $user->cache = time();
 
-      $cache_flush = variable_get('cache_flush', 0);
+      $cache_flush = variable_get('cache_flush'. $bin, 0);
       if ($cache_flush == 0) {
         // This is the first request to clear the cache, start a timer.
-        variable_set('cache_flush', time());
+        variable_set('cache_flush'. $bin, time());
       }
       else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
-        // Clear the cache for everyone, cache_flush_delay seconds have
+        // Clear the cache for everyone, cache_lifetime seconds have
         // passed since the first request to clear the cache.
         $cache->flush($bin);
-        variable_set('cache_flush', 0);
+        variable_set('cache_flush'. $bin, 0);
       }
     }
     else {
Index: engines/file.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/file.php,v
retrieving revision 1.1.6.13
diff -u -p -r1.1.6.13 file.php
--- engines/file.php	3 Sep 2009 10:02:23 -0000	1.1.6.13
+++ engines/file.php	28 Jan 2010 17:54:47 -0000
@@ -52,9 +52,9 @@ class fileCache extends Cache {
     }
     else {
       // garbage collection necessary when enforcing a minimum cache lifetime
-      $cache_flush = variable_get('cache_flush', 0);
+      $cache_flush = variable_get('cache_flush'. $this->name, 0);
       if ($cache_flush && ($cache_flush + $cache_lifetime <= time())) {
-        variable_set('cache_flush', 0);
+        variable_set('cache_flush'. $this->name, 0);
       }
     }