diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php index e229451..3ab6c83 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php @@ -19,7 +19,6 @@ class MenuFormController extends EntityFormController { * Overrides Drupal\Core\Entity\EntityFormController::form(). */ public function form(array $form, array &$form_state, EntityInterface $menu) { - $form = parent::form($form, $form_state, $menu); $system_menus = menu_list_system_menus(); $form_state['menu'] = &$menu; @@ -88,7 +87,7 @@ public function form(array $form, array &$form_state, EntityInterface $menu) { ); } - return $form; + return parent::form($form, $form_state, $menu); } /** @@ -101,15 +100,15 @@ protected function actions(array $form, array &$form_state) { $system_menus = menu_list_system_menus(); $actions['delete']['#access'] = !$menu->isNew() && !isset($system_menus[$menu->id()]); - // Add the language configuration submit handler. This is needed because - // the submit button has custom submit handlers. + // Add the language configuration submit handler. This is needed because the + // submit button has custom submit handlers. if (module_exists('language')) { array_unshift($actions['submit']['#submit'],'language_configuration_element_submit'); array_unshift($actions['submit']['#submit'], array($this, 'languageConfigurationSubmit')); } - // We cannot leverage the regular submit handler definition because we - // have button-specific ones here. Hence we need to explicitly set it for - // the submit action, otherwise it would be ignored. + // We cannot leverage the regular submit handler definition because we have + // button-specific ones here. Hence we need to explicitly set it for the + // submit action, otherwise it would be ignored. if (module_exists('translation_entity')) { array_unshift($actions['submit']['#submit'], 'translation_entity_language_configuration_element_submit'); }