[up] i18n 7.x-1.25

sites/all/modules/i18n/i18n.info

@@ -8,8 +8,8 @@ files[] = i18n_object.inc
 files[] = i18n.test
 configure = admin/config/regional/i18n
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_block/i18n_block.info

@@ -8,8 +8,8 @@ files[] = i18n_block.inc
 files[] = i18n_block.test
 
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_contact/i18n_contact.info

@@ -5,8 +5,8 @@ dependencies[] = i18n_string
 package = Multilingual - Internationalization
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_field/i18n_field.info

@@ -6,8 +6,8 @@ package = Multilingual - Internationalization
 core = 7.x
 files[] = i18n_field.inc
 files[] = i18n_field.test
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_forum/i18n_forum.info

@@ -7,8 +7,8 @@ package = Multilingual - Internationalization
 core = 7.x
 files[] = i18n_forum.test
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_menu/i18n_menu.info

@@ -10,8 +10,8 @@ core = 7.x
 files[] = i18n_menu.inc
 files[] = i18n_menu.test
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_menu/i18n_menu.module

@@ -62,8 +62,8 @@ function i18n_menu_menu_alter(&$items) {
  * @param $variables
  */
 function i18n_menu_preprocess_menu_admin_overview(&$variables) {
-  $variables['title'] = i18n_string(array('menu', 'menu', $variables['name'], 'title'), $variables['title']);
-  $variables['description'] = i18n_string(array('menu', 'menu', $variables['name'], 'description'), $variables['description']);
+  $variables['title'] = i18n_string(array('menu', 'menu', $variables['name'], 'title'), $variables['title'], array('sanitize' => FALSE));
+  $variables['description'] = i18n_string(array('menu', 'menu', $variables['name'], 'description'), $variables['description'], array('sanitize' => FALSE));
 }
 
 /**
@@ -522,7 +522,7 @@ function _i18n_menu_link_localize(&$link, $langcode = NULL) {
 function _i18n_menu_link_description($link, $langcode = NULL) {
   if (!empty($link['options']['attributes']['title'])) {
     $key = i18n_object_info('menu_link', 'key');
-    return i18n_string_translate(array('menu', 'item', $link[$key], 'description'), $link['options']['attributes']['title'], array('langcode' => $langcode));
+    return i18n_string_translate(array('menu', 'item', $link[$key], 'description'), $link['options']['attributes']['title'], array('langcode' => $langcode, 'sanitize' => FALSE));
   }
   else {
     return NULL;

sites/all/modules/i18n/i18n_node/i18n_node.info

@@ -9,8 +9,8 @@ configure = admin/config/regional/i18n/node
 files[]=i18n_node.test
 files[]=i18n_node.variable.inc
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_path/i18n_path.info

@@ -6,8 +6,8 @@ core = 7.x
 
 files[] = i18n_path.inc
 files[] = i18n_path.test
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_redirect/i18n_redirect.info

@@ -4,8 +4,8 @@ dependencies[] = i18n
 package = Multilingual - Internationalization
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_select/i18n_select.info

@@ -6,8 +6,8 @@ core = 7.x
 configure = admin/config/regional/i18n/select
 files[] = i18n_select.test
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_string/i18n_string.info

@@ -10,8 +10,8 @@ files[] = i18n_string.inc
 files[] = i18n_string.test
 configure = admin/config/regional/i18n/strings
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_string/i18n_string.install

@@ -95,7 +95,6 @@ function i18n_string_schema() {
       'objectindex' => array(
         'type' => 'int',
         'size' => 'big',
-        'length' => 20,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Integer value of Object ID.',
@@ -248,13 +247,21 @@ function i18n_string_update_7002() {
 }
 
 /**
- * Change objectindex from int to bigint.
+ * Removed due to buggy upgrade for #2200647.
  */
 function i18n_string_update_7003() {
+}
+
+/**
+ * Change objectindex from int to bigint.
+ */
+function i18n_string_update_7004() {
   db_change_field('i18n_string', 'objectindex', 'objectindex', array(
     'type' => 'int',
     'size' => 'big',
-    'length' => 20,
+    'not null' => TRUE,
+    'default' => 0,
+    'description' => 'Integer value of Object ID.',
   ));
 }
 

sites/all/modules/i18n/i18n_sync/i18n_sync.info

@@ -10,8 +10,8 @@ files[] = i18n_sync.install
 files[] = i18n_sync.module.inc
 files[] = i18n_sync.node.inc
 files[] = i18n_sync.test
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.info

@@ -11,8 +11,8 @@ files[] = i18n_taxonomy.pages.inc
 files[] = i18n_taxonomy.admin.inc
 files[] = i18n_taxonomy.test
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.module

@@ -1027,7 +1027,7 @@ function i18n_taxonomy_translate_terms($taxonomy, $langcode, $fullterms = TRUE)
       }
       elseif ($term->language && $term->language != $langcode) {
         $translation_set = i18n_translation_set_load($term->i18n_tsid);
-        $translations = $translation_set->get_translations();
+        $translations = ($translation_set) ? $translation_set->get_translations() : NULL;
 
         if ($translations && !empty($translations[$langcode])) {
           $newterm = $translations[$langcode];

sites/all/modules/i18n/i18n_translation/i18n_translation.info

@@ -6,8 +6,8 @@ core = 7.x
 
 files[] = i18n_translation.inc
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_user/i18n_user.info

@@ -4,8 +4,8 @@ core = 7.x
 package = Multilingual - Internationalization
 dependencies[] = i18n_variable
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/i18n_variable/i18n_variable.info

@@ -10,8 +10,8 @@ configure = admin/config/regional/i18n/variable
 files[] = i18n_variable.class.inc
 files[] = i18n_variable.test
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"

sites/all/modules/i18n/tests/i18n_test.info

@@ -7,8 +7,8 @@ package = Testing
 core = 6.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2018-04-20
-version = "7.x-1.24"
+; Information added by Drupal.org packaging script on 2018-07-11
+version = "7.x-1.25"
 core = "7.x"
 project = "i18n"
-datestamp = "1524222489"
+datestamp = "1531342125"