Commit 6cb27792 authored by Dries's avatar Dries
Browse files

- Patch #563106 by adrian, David_Rothstein: more upgrade path fixes to help...

- Patch #563106 by adrian, David_Rothstein: more upgrade path fixes to help contrib updates make progress.
parent 2e8d384c
......@@ -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'];
}
......
......@@ -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))
......
......@@ -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;
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment