Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/26/head
Angie Byron 2010-07-07 05:44:03 +00:00
parent 47b8bec8e2
commit 449f1f7cbd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/update.inc
View File

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

2
modules/locale/locale.install
View File

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