summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-10-20 00:37:20 +0000
committerDries Buytaert <dries@buytaert.net>2010-10-20 00:37:20 +0000
commit1fbb06abee7dc7797f5ab3c70faa35ff9a6939a1 (patch)
tree9f3664400d7725e3aba1aef0d8fcdc982b1fadec
parentd9cc13e9f0c1e64342d8e6c91396ce70ffbb30c6 (diff)
downloadbrdo-1fbb06abee7dc7797f5ab3c70faa35ff9a6939a1.tar.gz
brdo-1fbb06abee7dc7797f5ab3c70faa35ff9a6939a1.tar.bz2
- Patch ##864020 by Jose Reyero, catch, sun: locale upgrade to D7 fails due to index added by i18nstrings module.
-rw-r--r--modules/locale/locale.install14
1 files changed, 13 insertions, 1 deletions
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 5398c9495..c51033ea7 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -38,7 +38,19 @@ function locale_install() {
function locale_update_7000() {
db_drop_index('locales_source', 'source');
db_add_index('locales_source', 'source_context', array(array('source', 30), 'context'));
- db_change_field('locales_source', 'location', 'location', array('type' => 'text', 'size' => 'big', 'not null' => FALSE));
+
+ // Also drop the 'textgroup_location' index added by the i18nstrings module
+ // of the i18n project, which prevents the below schema update from running.
+ if (db_index_exists('locales_source', 'textgroup_location')) {
+ db_drop_index('locales_source', 'textgroup_location');
+ }
+
+ db_change_field('locales_source', 'location', 'location', array(
+ 'type' => 'text',
+ 'not null' => FALSE,
+ 'size' => 'big',
+ 'description' => 'Drupal path in case of online discovered translations or file path in case of imported strings.',
+ ));
}
/**