diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index c48ea54..c84962d 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -185,21 +185,18 @@ public function form(array $form, array &$form_state) { ); // Set up defaults for menu links that already exist. - $default_langcode = $menu_link->langcode; $language_show = FALSE; - if ($menu_link->isNew()) { - // Adding a new menu link, use the default from language settings config. - if ($this->moduleHandler->moduleExists('language')) { - $language_configuration = language_get_default_configuration('menu_link', $menu_link->bundle()); - $default_langcode = $language_configuration['langcode']; - $language_show = $language_configuration['language_show']; - } - // If there are no default language settings for menu links of this menu, - // default to the language of the menu. - else { - $default_langcode = entity_load('menu', $menu_link->menu_name)->langcode; - } + // Adding a new menu link, use the default from language settings config. + if ($this->moduleHandler->moduleExists('language')) { + $language_configuration = language_get_default_configuration('menu_link', $menu_link->bundle()); + $default_langcode = ($menu_link->isNew()) ? $menu_link->langcode : $language_configuration['langcode']; + $language_show = $language_configuration['language_show']; + } + // If there are no default language settings for menu links of this menu, + // default to the language of the menu. + else { + $default_langcode = ($menu_link->isNew()) ? $menu_link->langcode : entity_load('menu', $menu_link->menu_name)->langcode; } $form['langcode'] = array(