diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-07 05:44:03 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-07 05:44:03 +0000 |
| commit | 449f1f7cbd5399b1ad092378d1fcf80e91507cb0 (patch) | |
| tree | bb78968dd339c8c089c0da0c3924533c20c08b22 | |
| parent | 47b8bec8e290a05af368d05deb7fb0cc98ef0292 (diff) | |
| download | brdo-449f1f7cbd5399b1ad092378d1fcf80e91507cb0.tar.gz brdo-449f1f7cbd5399b1ad092378d1fcf80e91507cb0.tar.bz2 | |
#845746 by Berdir: Fixed update process broken on multi-language sites using i18n module.
| -rw-r--r-- | includes/update.inc | 5 | ||||
| -rw-r--r-- | modules/locale/locale.install | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/includes/update.inc b/includes/update.inc index 7db61191e..c3fde15b1 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -591,6 +591,11 @@ function update_fix_d7_requirements() { // Add new primary key. db_add_primary_key('sessions', array('sid', 'ssid')); + // Allow longer javascript file names. + if (db_table_exists('languages')) { + db_change_field('languages', 'javascript', 'javascript', array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => '')); + } + variable_set('update_d7_requirements', TRUE); } diff --git a/modules/locale/locale.install b/modules/locale/locale.install index 4269023b3..c8d8e6e00 100644 --- a/modules/locale/locale.install +++ b/modules/locale/locale.install @@ -106,7 +106,7 @@ function locale_update_7001() { * Allow longer javascript file names. */ function locale_update_7002() { - db_change_field('languages', 'javascript', 'javascript', array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => '')); + // Update moved to update_fix_d7_requirements(). } /** |