- Patch #690746 by jbrown, Ognyan Kulev, Crell, MichaelCole, Damien Tournoud: text column type doesn't reliably hold serialized variables.

1 files changed, 18 insertions, 2 deletions

diff --git a/modules/block/block.install b/modules/block/block.install
index 8f6863a90..0c0b324c4 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -189,6 +189,11 @@ function block_install() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Block updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Set system.weight to a low value for block module.
  *
  * Block should go first so that other modules can alter its output
@@ -389,8 +394,19 @@ function block_update_7004() {
 }
 
 /**
- * Remove {cache_block}.headers column.
+ * Recreates cache_block table.
+ *
+ * Converts fields that hold serialized variables from text to blob.
+ * Removes 'headers' column.
  */
 function block_update_7005() {
-  db_drop_field('cache_block', 'headers');
+  $schema = system_schema_cache_7054();
+
+  db_drop_table('cache_block');
+  db_create_table('cache_block', $schema);
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */