### Eclipse Workspace Patch 1.0
#P drupal_test_6
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.580
diff -u -r1.580 system.module
--- modules/system/system.module	24 Jan 2008 10:46:54 -0000	1.580
+++ modules/system/system.module	27 Jan 2008 01:52:56 -0000
@@ -580,6 +580,8 @@
       $blocks[0] = array(
         'info' => t('Powered by Drupal'),
         'weight' => '10',
+         // Not worth caching.
+        'cache' => BLOCK_NO_CACHE,
       );
       return $blocks;
     case 'configure':
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.235
diff -u -r1.235 system.install
--- modules/system/system.install	24 Jan 2008 10:41:17 -0000	1.235
+++ modules/system/system.install	27 Jan 2008 01:52:55 -0000
@@ -68,7 +68,7 @@
     'title' => $t('PHP register globals'),
   );
   $register_globals = trim(ini_get('register_globals'));
-  // Unfortunately, ini_get() may return many different values, and we can't 
+  // Unfortunately, ini_get() may return many different values, and we can't
   // be certain which values mean 'on', so we instead check for 'not off'
   // since we never want to tell the user that their site is secure
   // (register_globals off), when it is in fact on. We can only guarantee
@@ -393,9 +393,9 @@
 
   db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", 'theme_default', 's:7:"garland";');
   db_query("UPDATE {system} SET status = %d WHERE type = '%s' AND name = '%s'", 1, 'theme', 'garland');
-  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s')", 'user', '0', 'garland', 1, 0, 'left', '');
-  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s')", 'user', '1', 'garland', 1, 0, 'left', '');
-  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s')", 'system', '0', 'garland', 1, 10, 'footer', '');
+  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', '0', 'garland', 1, 0, 'left', '', -1);
+  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', '1', 'garland', 1, 0, 'left', '', -1);
+  db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', '0', 'garland', 1, 10, 'footer', '', -1);
 
   db_query("INSERT INTO {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete) VALUES (%d, %d, '%s', %d, %d, %d)", 0, 0, 'all', 1, 0, 0);
 
@@ -2480,6 +2480,17 @@
 }
 
 /**
+ * Fix cache mode for blocks inserted in system_install() in fresh installs of previous RC.
+ */
+function system_update_6047() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {blocks} SET cache = %d WHERE module = '%s' AND delta = '%s'", -1, 'user', '0');
+  $ret[] = update_sql("UPDATE {blocks} SET cache = %d WHERE module = '%s' AND delta = '%s'", -1, 'user', '1');
+  $ret[] = update_sql("UPDATE {blocks} SET cache = %d WHERE module = '%s' AND delta = '%s'", -1, 'system', '0');
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-5.x-to-6.x"
  * The next series of updates should start at 7000.
  */