diff --git a/core/modules/content_moderation/content_moderation.module b/core/modules/content_moderation/content_moderation.module index 16680e2de1..39ffc94c0a 100644 --- a/core/modules/content_moderation/content_moderation.module +++ b/core/modules/content_moderation/content_moderation.module @@ -196,7 +196,6 @@ function content_moderation_entity_field_access($operation, FieldDefinitionInter } return AccessResult::neutral(); - } /** diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 41e7a86fb5..cffccde768 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -352,7 +352,11 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { '#description' => t('Menu links with lower weights are displayed before links with higher weights.'), ]; - $form['actions']['submit']['#submit'][] = 'menu_ui_form_node_form_submit'; + foreach (array_keys($form['actions']) as $action) { + if ($action != 'preview' && isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] === 'submit') { + $form['actions'][$action]['#submit'][] = 'menu_ui_form_node_form_submit'; + } + } } /** diff --git a/core/modules/node/node.install b/core/modules/node/node.install index c8967ce3fd..0c8cd669f5 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -247,24 +247,3 @@ function node_update_8301() { $entity_type->set('entity_keys', $keys); $definition_update_manager->updateEntityType($entity_type); } - -/** - * Load all form displays for nodes, add status with these settings, save. - */ -function node_update_8400() { - $query = \Drupal::entityQuery('entity_form_display')->condition('targetEntityType', 'node'); - $ids = $query->execute(); - $form_displays = EntityFormDisplay::loadMultiple($ids); - - // Assign status settings for each 'node' target entity types with 'default' - // form mode. - foreach ($form_displays as $id => $form_display) { - /** @var \Drupal\Core\Entity\Display\EntityDisplayInterface $form_display */ - $form_display->setComponent('status', [ - 'type' => 'boolean_checkbox', - 'settings' => [ - 'display_label' => TRUE, - ], - ])->save(); - } -} diff --git a/core/modules/node/node.post_update.php b/core/modules/node/node.post_update.php index e69de29bb2..8e296c4ddf 100644 --- a/core/modules/node/node.post_update.php +++ b/core/modules/node/node.post_update.php @@ -0,0 +1,29 @@ +condition('targetEntityType', 'node'); + $ids = $query->execute(); + $form_displays = EntityFormDisplay::loadMultiple($ids); + + // Assign status settings for each 'node' target entity types with 'default' + // form mode. + foreach ($form_displays as $id => $form_display) { + /** @var \Drupal\Core\Entity\Display\EntityDisplayInterface $form_display */ + $form_display->setComponent('status', [ + 'type' => 'boolean_checkbox', + 'settings' => [ + 'display_label' => TRUE, + ], + ])->save(); + } +} diff --git a/core/modules/node/src/Tests/Update/NodeUpdateTest.php b/core/modules/node/src/Tests/Update/NodeUpdateTest.php index 0111606035..141c714850 100644 --- a/core/modules/node/src/Tests/Update/NodeUpdateTest.php +++ b/core/modules/node/src/Tests/Update/NodeUpdateTest.php @@ -42,7 +42,7 @@ public function testPublishedEntityKey() { /** * Tests that the node entity form has the status checkbox. * - * @see node_update_8302() + * @see node_post_update_add_status() */ public function testStatusCheckbox() { // Run updates.