- Patch #934050 by sun, alex_b: change format into string.

1 files changed, 19 insertions, 2 deletions

diff --git a/modules/block/block.install b/modules/block/block.install
index b45c5e5e2..7567499f3 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -155,8 +155,8 @@ function block_schema() {
         'description' => 'Block description.',
       ),
       'format' => array(
-        'type' => 'int',
-        'unsigned' => TRUE,
+        'type' => 'varchar',
+        'length' => 255,
         'not null' => FALSE,
         'description' => 'The {filter_format}.format of the block body.',
       ),
@@ -196,6 +196,11 @@ function block_update_dependencies() {
   $dependencies['block'][7005] = array(
     'filter' => 7000,
   );
+  // Ensure that format columns are only changed after Filter module has changed
+  // the primary records.
+  $dependencies['block'][7007] = array(
+    'filter' => 7010,
+  );
 
   return $dependencies;
 }
@@ -445,6 +450,18 @@ function block_update_7006() {
 }
 
 /**
+ * Change {block_custom}.format into varchar.
+ */
+function block_update_7007() {
+  db_change_field('block_custom', 'format', 'format', array(
+    'type' => 'varchar',
+    'length' => 255,
+    'not null' => FALSE,
+    'description' => 'The {filter_format}.format of the block body.',
+  ));
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */