Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.147
diff -u -p -r1.147 bootstrap.inc
--- includes/bootstrap.inc	29 Jan 2007 19:25:19 -0000	1.147
+++ includes/bootstrap.inc	24 Mar 2007 23:31:01 -0000
@@ -346,7 +346,7 @@ function variable_init($conf = array()) 
     while ($variable = db_fetch_object($result)) {
       $variables[$variable->name] = unserialize($variable->value);
     }
-    cache_set('variables', 'cache', serialize($variables));
+    cache_set('variables', serialize($variables), 'cache');
   }
 
   foreach ($conf as $name => $value) {
Index: includes/cache.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/cache.inc,v
retrieving revision 1.6
diff -u -p -r1.6 cache.inc
--- includes/cache.inc	27 Feb 2007 12:04:39 -0000	1.6
+++ includes/cache.inc	24 Mar 2007 23:31:01 -0000
@@ -74,11 +74,11 @@ function cache_get($key, $table = 'cache
  *
  * @param $cid
  *   The cache ID of the data to store.
+ * @param $data
+ *   The data to store in the cache. Complex data types must be serialized first.
  * @param $table
  *   The table $table to store the data in. Valid core values are 'cache_filter',
  *   'cache_menu', 'cache_page', or 'cache'.
- * @param $data
- *   The data to store in the cache. Complex data types must be serialized first.
  * @param $expire
  *   One of the following values:
  *   - CACHE_PERMANENT: Indicates that the item should never be removed unless
@@ -90,7 +90,7 @@ function cache_get($key, $table = 'cache
  * @param $headers
  *   A string containing HTTP header information for cached pages.
  */
-function cache_set($cid, $table = 'cache', $data, $expire = CACHE_PERMANENT, $headers = NULL) {
+function cache_set($cid, $data, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
   db_lock_table($table);
   db_query("UPDATE {%s} SET data = %b, created = %d, expire = %d, headers = '%s' WHERE cid = '%s'", $table, $data, time(), $expire, $headers, $cid);
   if (!db_affected_rows()) {
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.619
diff -u -p -r1.619 common.inc
--- includes/common.inc	8 Mar 2007 19:33:55 -0000	1.619
+++ includes/common.inc	24 Mar 2007 23:31:02 -0000
@@ -1949,7 +1949,7 @@ function page_set_cache() {
       }
       ob_end_flush();
       if ($cache && $data) {
-        cache_set($base_root . request_uri(), 'cache_page', $data, CACHE_TEMPORARY, drupal_get_headers());
+        cache_set($base_root . request_uri(), $data, 'cache_page', CACHE_TEMPORARY, drupal_get_headers());
       }
     }
   }
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.166
diff -u -p -r1.166 filter.module
--- modules/filter/filter.module	12 Mar 2007 11:31:02 -0000	1.166
+++ modules/filter/filter.module	24 Mar 2007 23:31:03 -0000
@@ -757,7 +757,7 @@ function check_markup($text, $format = F
 
     // Store in cache with a minimum expiration time of 1 day.
     if ($cache) {
-      cache_set($id, 'cache_filter', $text, time() + (60 * 60 * 24));
+      cache_set($id, $text, 'cache_filter', time() + (60 * 60 * 24));
     }
   }
   else {
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.160
diff -u -p -r1.160 locale.module
--- modules/locale/locale.module	27 Feb 2007 12:29:22 -0000	1.160
+++ modules/locale/locale.module	24 Mar 2007 23:31:03 -0000
@@ -223,7 +223,7 @@ function locale_refresh_cache() {
     while ($data = db_fetch_object($result)) {
       $t[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
     }
-    cache_set("locale:$locale", 'cache', serialize($t));
+    cache_set("locale:$locale", serialize($t), 'cache');
   }
 }