diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-30 03:44:39 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-30 03:44:39 +0000 |
| commit | cb5e5a137c1ffa7a4136814bede8d55859647bae (patch) | |
| tree | de265c79e2bc3c8419f1b3c67e75cc41e190221c | |
| parent | 90155726d0ed479c015db327a65f087d769f7e27 (diff) | |
| download | brdo-cb5e5a137c1ffa7a4136814bede8d55859647bae.tar.gz brdo-cb5e5a137c1ffa7a4136814bede8d55859647bae.tar.bz2 | |
#989556 by bfroehle: Fixed Broken Upgrade: filter #7001
| -rw-r--r-- | modules/filter/filter.install | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/upgrade/drupal-6.filled.database.php | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/modules/filter/filter.install b/modules/filter/filter.install index f8850ad46..2d9c6af64 100644 --- a/modules/filter/filter.install +++ b/modules/filter/filter.install @@ -205,7 +205,7 @@ function filter_update_7001() { if (variable_get('filter_html_' . $format_id, 1) == 2) { $insert->values(array( 'format' => $format_id, - 'filter' => 'filter', + 'module' => 'filter', 'delta' => 4, 'weight' => 0, )); diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php index 25092e70f..7afa04442 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php @@ -1034,6 +1034,12 @@ db_insert('filter_formats')->fields(array( 'roles' => '', 'cache' => '1', )) +->values(array( + 'format' => '3', + 'name' => 'Escape HTML Filter', + 'roles' => '', + 'cache' => '1', +)) ->execute(); db_create_table('filters', array( @@ -19749,6 +19755,12 @@ db_insert('variable')->fields(array( 'name' => 'filter_html_1', 'value' => 'i:1;', )) +// Add the Escape HTML filter to the custom input format 'Escape HTML Filter' +// to test that the filter may be upgraded to its Drupal 7 equivalent. +->values(array( + 'name' => 'filter_html_3', + 'value' => 'i:2;', +)) ->values(array( 'name' => 'install_profile', 'value' => 's:7:"default";', |