--- cacherouter-1.2.6.9.inc	2009-03-30 14:53:07.000000000 -0700
+++ cacherouter.inc	2009-03-30 14:54:47.000000000 -0700
@@ -32,7 +32,7 @@ function cache_set($key, $bin = 'cache',
   return $cache->set($key, $value, $expire, $headers, $bin);
 }
 
-function cache_clear_all($key = NULL, $bin = NULL, $wildcard = FALSE) {
+function cache_clear_all($cid = NULL, $bin = NULL, $wildcard = FALSE) {
   global $cache;
   global $user;
   
@@ -40,7 +40,7 @@ function cache_clear_all($key = NULL, $b
     $cache = new CacheRouter();
   }
   
-  if (!isset($key) && !isset($bin)) {
+  if (!isset($cid) && !isset($bin)) {
     // Clear the block cache first, so stale data will
     // not end up in the page cache.
     $cache->flush('cache_block');
@@ -48,7 +48,7 @@ function cache_clear_all($key = NULL, $b
     return;
   }
   
-  if (empty($key)) {
+  if (empty($cid)) {
     if (variable_get('cache_lifetime', 0)) {
       // We store the time in the current user's $user->cache variable which
       // will be saved into the sessions table by sess_write(). We then