#845746 by Berdir: Fixed update process broken on multi-language sites using i18n module.

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);
   }
 

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().
 }
 
 /**