diff options
| -rw-r--r-- | modules/comment/comment.install | 10 | ||||
| -rw-r--r-- | modules/filter/filter.install | 5 | ||||
| -rw-r--r-- | modules/node/node.install | 1 | ||||
| -rw-r--r-- | modules/system/system.install | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/modules/comment/comment.install b/modules/comment/comment.install index b6579e751..501252eb0 100644 --- a/modules/comment/comment.install +++ b/modules/comment/comment.install @@ -247,6 +247,9 @@ function comment_update_7011() { * Create the comment_body field. */ function comment_update_7012() { + // @todo Remove when http://drupal.org/node/211182 is fixed. + taxonomy_update_7002(); + // Create comment body field. $field = array( 'field_name' => 'comment_body', @@ -308,6 +311,13 @@ function comment_update_7013(&$sandbox) { db_insert($comment_body_table) ->from($query) ->execute(); + // Update the comment body format in a similar manner as is done for other + // modules in filter_update_7005(), but we do this one here since we are + // already migrating the data. + db_update($comment_body_table) + ->fields(array('comment_body_format' => variable_get('filter_default_format', 1))) + ->condition('comment_body_format', 0) + ->execute(); $sandbox['#finished'] = 1 - count($sandbox['types']) / $sandbox['total']; } diff --git a/modules/filter/filter.install b/modules/filter/filter.install index 6fd3701da..9b3efc069 100644 --- a/modules/filter/filter.install +++ b/modules/filter/filter.install @@ -335,8 +335,9 @@ function filter_update_7005() { // using the default text format. Therefore, we have to convert all such // instances (in Drupal core) to explicitly use the appropriate format. // Note that the update of the node body field is handled separately, in - // node_update_7006(). - foreach (array('block_custom', 'comment') as $table) { + // node_update_7006(), as is the update of the comment body field, in + // comment_update_7013(). + foreach (array('block_custom') as $table) { if (db_table_exists($table)) { db_update($table) ->fields(array('format' => $default_format)) diff --git a/modules/node/node.install b/modules/node/node.install index 7fe280de2..26296facb 100644 --- a/modules/node/node.install +++ b/modules/node/node.install @@ -437,6 +437,7 @@ function node_update_7005() { * Convert body and teaser from node properties to fields, and migrate status/comment/promote and sticky columns to the {node_revision} table. */ function node_update_7006(&$context) { + // @todo Remove when http://drupal.org/node/211182 is fixed. taxonomy_update_7002(); $context['#finished'] = 0; diff --git a/modules/system/system.install b/modules/system/system.install index eeb81c0f0..52d51d320 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2242,10 +2242,6 @@ function system_update_7026() { */ function system_update_7027() { $module_list = array('text', 'number', 'list', 'options'); - db_delete('system') - ->condition('type', 'module') - ->condition('name', $module_list) - ->execute(); module_enable($module_list, FALSE); } |