- Patch #287949 by Freso, Damien Tournoud: keep language icons in consistent order across nodes.

1 files changed, 9 insertions, 7 deletions

diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index d46900eb7..79d746e6d 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -166,13 +166,15 @@ function translation_link($type, $node = NULL, $teaser = FALSE) {
     // Do not show link to the same node.
     unset($translations[$node->language]);
     $languages = language_list();
-    foreach ($translations as $language => $translation) {
-      $links["node_translation_$language"] = array(
-        'title' => $languages[$language]->native,
-        'href' => "node/$translation->nid",
-        'language' => $languages[$language],
-        'attributes' => array('title' => $translation->title, 'class' => 'translation-link')
-      );
+    foreach ($languages as $langcode => $language) {
+      if (isset($translations[$langcode])) {
+        $links["node_translation_$langcode"] = array(
+          'title' => $language->native,
+          'href' => 'node/' . $translations[$langcode]->nid,
+          'language' => $language,
+          'attributes' => array('title' => $translations[$langcode]->title, 'class' => 'translation-link')
+        );
+      }
     }
   }
   return $links;