- Patch #635094 by plach: unify 'language neutral' language codes.

2 files changed, 3 insertions, 3 deletions

diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 93face4a6..5396d6ced 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -484,7 +484,7 @@ function menu_node_save($node) {
       $link['link_path'] = "node/$node->nid";
       // If not already set, use the node's title as link title attribute.
       if (empty($link['options']['attributes']['title']) && !$link['customized']) {
-        $link['options']['attributes']['title'] = trim($node->title[FIELD_LANGUAGE_NONE][0]['value']);
+        $link['options']['attributes']['title'] = trim($node->title[LANGUAGE_NONE][0]['value']);
       }
       if (!menu_link_save($link)) {
         drupal_set_message(t('There was an error saving the menu link.'), 'error');
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index fbd3fe74f..d4a2772e6 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -315,7 +315,7 @@ class MenuTestCase extends DrupalWebTestCase {
 
       // Verify menu link link.
       $this->clickLink($title);
-      $title = $parent_node->title[FIELD_LANGUAGE_NONE][0]['value'];
+      $title = $parent_node->title[LANGUAGE_NONE][0]['value'];
       $this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Parent menu link link target was correct'));
     }
 
@@ -325,7 +325,7 @@ class MenuTestCase extends DrupalWebTestCase {
 
     // Verify menu link link.
     $this->clickLink($title);
-    $title = $item_node->title[FIELD_LANGUAGE_NONE][0]['value'];
+    $title = $item_node->title[LANGUAGE_NONE][0]['value'];
     $this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Menu link link target was correct'));
   }