Index: cacherouter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cacherouter/cacherouter.inc,v
retrieving revision 1.2.2.15
diff -u -p -r1.2.2.15 cacherouter.inc
--- cacherouter.inc	29 Jan 2010 15:17:29 -0000	1.2.2.15
+++ cacherouter.inc	6 Feb 2010 13:13:17 -0000
@@ -19,12 +19,12 @@ require dirname(__FILE__) . '/CacheRoute
  *   'cache_menu', 'cache_page', or 'cache' for the default cache.
  */
 function cache_get($key, $table = 'cache') {
-  global $cache_router, $user;
-  if (!isset($cache_router)) {
-    $cache_router = new CacheRouter();
+  global $_cacherouter_, $user;
+  if (!isset($_cacherouter_)) {
+    $_cacherouter_ = new CacheRouter();
   }
 
-  $cache_object = $cache_router->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;
@@ -87,11 +87,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_router;
-  if (!isset($cache_router)) {
-    $cache_router = new CacheRouter();
+  global $_cacherouter_;
+  if (!isset($_cacherouter_)) {
+    $_cacherouter_ = new CacheRouter();
   }
-  return $cache_router->set($key, $value, $expire, $headers, $table);
+  return $_cacherouter_->set($key, $value, $expire, $headers, $table);
 }
 
 /**
@@ -113,17 +113,17 @@ 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_router, $user;
+  global $_cacherouter_, $user;
 
-  if (!isset($cache_router)) {
-    $cache_router = 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_router->flush('cache_block');
-    $cache_router->flush('cache_page');
+    $_cacherouter_->flush('cache_block');
+    $_cacherouter_->flush('cache_page');
     return;
   }
 
@@ -143,27 +143,27 @@ function cache_clear_all($key = NULL, $t
       elseif (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
         // Clear the cache for everyone, cache_lifetime seconds have
         // passed since the first request to clear the cache.
-        $cache_router->flush($table);
+        $_cacherouter_->flush($table);
         variable_set('cache_flush_' . $table, 0);
       }
     }
     else {
       // No minimum cache lifetime, flush all temporary cache entries now.
-      $cache_router->flush($table);
+      $_cacherouter_->flush($table);
     }
   }
   else {
     if ($wildcard) {
       if ($key == '*' || empty($key)) {
-        $cache_router->delete('*', $table);
+        $_cacherouter_->delete('*', $table);
       }
       else {
-        $cache_router->delete($key .'*', $table);
+        $_cacherouter_->delete($key .'*', $table);
       }
     }
     else {
       $key = str_replace('*', '', $key);
-      $cache_router->delete($key, $table);
+      $_cacherouter_->delete($key, $table);
     }
   }
 }
@@ -173,14 +173,14 @@ function cache_clear_all($key = NULL, $t
  */
 if (!function_exists('page_cache_fastpath')) {
   function page_cache_fastpath() {
-    global $base_root, $cache_router;
+    global $base_root, $_cacherouter_;
 
     if (empty($_POST) && !isset($_COOKIE['DRUPAL_UID'])) {
-      if (!isset($cache_router)) {
-        $cache_router = new CacheRouter();
+      if (!isset($_cacherouter_)) {
+        $_cacherouter_ = new CacheRouter();
       }
-      if ($cache_router->page_fast_cache('cache_page')) {
-        $page = $cache_router->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();