? 564460_cr_class.patch
? cache_flush.patch
Index: Cache.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/Cache.php,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 Cache.php
--- Cache.php	5 Sep 2009 13:03:25 -0000	1.1.2.14
+++ Cache.php	27 Jan 2010 08:40:11 -0000
@@ -5,7 +5,7 @@
  * @file Cache.php
  *   Defines the base class for cache engines
  */
-class Cache {
+class CacheEngine {
   var $settings = array();
   var $content = array();
   var $prefix;
Index: cacherouter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/cacherouter.inc,v
retrieving revision 1.2.2.12
diff -u -p -r1.2.2.12 cacherouter.inc
--- cacherouter.inc	5 Sep 2009 13:03:25 -0000	1.2.2.12
+++ cacherouter.inc	27 Jan 2010 08:40:11 -0000
@@ -18,12 +18,12 @@ require dirname(__FILE__) .'/CacheRouter
  *   'cache_menu', 'cache_page', or 'cache' for the default cache.
  */
 function cache_get($key, $table = 'cache') {
-  global $cache, $user;
+  global $cacherouter, $user;
   if (!isset($cache)) {
-    $cache = new CacheRouter();
+    $cacherouter = new CacheRouter();
   }
   
-  $cache_object = $cache->get($key, $table);  
+  $cache_object = $cacherouter->get($key, $table);  
   if (isset($cache_object->data)) {
     if ($cache_object->expire == CACHE_PERMANENT || !variable_get('cache_lifetime', 0)) {
       return $cache_object;
@@ -86,11 +86,11 @@ function cache_get($key, $table = 'cache
  *   A string containing HTTP header information for cached pages.
  */
 function cache_set($key, $value, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
-  global $cache;
-  if (!isset($cache)) {
-    $cache = new CacheRouter();
+  global $cacherouter;
+  if (!isset($cacherouter)) {
+    $cacherouter = new CacheRouter();
   }
-  return $cache->set($key, $value, $expire, $headers, $table);
+  return $cacherouter->set($key, $value, $expire, $headers, $table);
 }
 
 /**
@@ -112,18 +112,18 @@ function cache_set($key, $value, $table 
  *   match. If '*' is given as $key, the table $table will be emptied.
  */
 function cache_clear_all($key = NULL, $table = NULL, $wildcard = FALSE) {
-  global $cache;
+  global $cacherouter;
   global $user;
 
-  if (!isset($cache)) {
-    $cache = new CacheRouter();
+  if (!isset($cacherouter)) {
+    $cacherouter = new CacheRouter();
   }
 
   if (!isset($key) && !isset($table)) {
     // Clear the block cache first, so stale data will
     // not end up in the page cache.
-    $cache->flush('cache_block');
-    $cache->flush('cache_page');
+    $cacherouter->flush('cache_block');
+    $cacherouter->flush('cache_page');
     return;
   }
 
@@ -143,27 +143,27 @@ function cache_clear_all($key = NULL, $t
       else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
         // Clear the cache for everyone, cache_flush_delay seconds have
         // passed since the first request to clear the cache.
-        $cache->flush($table);
+        $cacherouter->flush($table);
         variable_set('cache_flush', 0);
       }
     }
     else {
       // No minimum cache lifetime, flush all temporary cache entries now.
-      $cache->flush($table);
+      $cacherouter->flush($table);
     }
   }
   else {
     if ($wildcard) {
       if ($key == '*' || empty($key)) {
-        $cache->delete('*', $table);
+        $cacherouter->delete('*', $table);
       }
       else {
-        $cache->delete($key .'*', $table);
+        $cacherouter->delete($key .'*', $table);
       }
     }
     else {
       $key = str_replace('*', '', $key);
-      $cache->delete($key, $table);
+      $cacherouter->delete($key, $table);
     }
   }
 }
@@ -174,14 +174,14 @@ function cache_clear_all($key = NULL, $t
 if (!function_exists('page_cache_fastpath')) {
   function page_cache_fastpath() {
     global $base_root;
-    global $cache;
+    global $cacherouter;
   
     if (empty($_POST) && !isset($_COOKIE['DRUPAL_UID'])) {
-      if (!isset($cache)) {
-        $cache = new CacheRouter();
+      if (!isset($cacherouter)) {
+        $cacherouter = new CacheRouter();
       }
-      if ($cache->page_fast_cache('cache_page')) {
-        $page = $cache->get($base_root . request_uri(), 'cache_page');
+      if ($cacherouter->page_fast_cache('cache_page')) {
+        $page = $cacherouter->get($base_root . request_uri(), 'cache_page');
         if (!empty($page)) {
           drupal_page_header();
         
Index: engines/apc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/apc.php,v
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.17 apc.php
--- engines/apc.php	5 Sep 2009 13:03:25 -0000	1.1.2.17
+++ engines/apc.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file apc.php
  *   APC engine class.
  */
-class apcCache extends Cache {
+class apcCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.
Index: engines/db.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/db.php,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 db.php
--- engines/db.php	5 Sep 2009 13:03:25 -0000	1.1.2.10
+++ engines/db.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file db.php
  *   Database engine file.
  */
-class dbCache extends Cache {  
+class dbCache extends CacheEngine {  
   function page_fast_cache() {
     if ($this->fast_cache === TRUE) {
       require_once './includes/database.inc';
Index: engines/eacc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/eacc.php,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 eacc.php
--- engines/eacc.php	5 Sep 2009 13:03:25 -0000	1.1.2.14
+++ engines/eacc.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file eacc.php
  *   Engine file for eAccelerator.
  */
-class eaccCache extends Cache {
+class eaccCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.
Index: engines/file.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/file.php,v
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.17 file.php
--- engines/file.php	5 Sep 2009 13:03:25 -0000	1.1.2.17
+++ engines/file.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file file.php
  *   Engine file for file based.
  */
-class fileCache extends Cache {
+class fileCache extends CacheEngine {
   var $content = array();
   var $fspath = '/tmp/filecache';
   
Index: engines/memcache.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/memcache.php,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 memcache.php
--- engines/memcache.php	5 Sep 2009 13:03:25 -0000	1.1.2.13
+++ engines/memcache.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file memcache.php
  *   Engine file for memcache.
  */
-class memcacheCache extends Cache {
+class memcacheCache extends CacheEngine {
   var $settings = array();
   var $memcache;
   
Index: engines/memcached.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/Attic/memcached.php,v
retrieving revision 1.1.4.3
diff -u -p -r1.1.4.3 memcached.php
--- engines/memcached.php	5 Sep 2009 13:03:25 -0000	1.1.4.3
+++ engines/memcached.php	27 Jan 2010 08:40:12 -0000
@@ -10,7 +10,7 @@
  *   you use this on a production site.  You have been warned.
  *   ---
  */
-class memcachedCache extends Cache {
+class memcachedCache extends CacheEngine {
   var $settings = array();
   var $memcached;
   
Index: engines/none.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/Attic/none.php,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 none.php
--- engines/none.php	3 Sep 2009 08:34:11 -0000	1.1.4.2
+++ engines/none.php	27 Jan 2010 08:40:12 -0000
@@ -6,7 +6,7 @@
  *   Disable caching altogether.  Useful for debugging and various situations
  *   where caching is undesired.  Please be very careful in using this engine.
  */
-class noneCache extends Cache {
+class noneCache extends CacheEngine {
   var $content = array();
   
   function page_fast_cache() {
Index: engines/xcache.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/engines/xcache.php,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 xcache.php
--- engines/xcache.php	5 Sep 2009 13:03:25 -0000	1.1.2.14
+++ engines/xcache.php	27 Jan 2010 08:40:12 -0000
@@ -5,7 +5,7 @@
  * @file xcache.php
  *   Engine file for XCache.
  */
-class xcacheCache extends Cache {
+class xcacheCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.