diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index e46c0c2ba02a56d008c76f67d325189b1a2e3b0f..e77410f9d29b83e0c7a0a16d540968f1b45e69a4 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -196,7 +196,7 @@ function menu_ui_node_save(EntityInterface $node) { $definition = $node->menu; if (trim($definition['title'])) { if (!empty($definition['entity_id'])) { - $entity = entity_load('menu_link_content', $definition['entity_id']); + $entity = MenuLinkContent::load($definition['entity_id']); $entity->enabled->value = 1; $entity->title->value = trim($definition['title']); $entity->description->value = trim($definition['description']); @@ -412,7 +412,7 @@ function menu_ui_node_submit(EntityInterface $node, $form, FormStateInterface $f $definition = $form_state->getValue('menu'); if (empty($definition['enabled'])) { if ($definition['entity_id']) { - $entity = entity_load('menu_link_content', $definition['entity_id']); + $entity = MenuLinkContent::load($definition['entity_id']); $entity->delete(); } } diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php index e08e1a8d4dc7ca1b9c924a158deb1b8a59fd3239..2337450e903721b14b8bd55947bc2a2ae48dd9d3 100644 --- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php +++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php @@ -8,6 +8,7 @@ namespace Drupal\menu_ui\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\menu_link_content\Entity\MenuLinkContent; /** * Add, edit, and delete a node with menu link. @@ -140,7 +141,7 @@ function testMenuNodeFormWidget() { $this->assertText('Provide a menu link', 'Link in not allowed menu not shown in node edit form'); // Assert that the link is still in the Administration menu after save. $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save')); - $link = entity_load('menu_link_content', $item->id()); + $link = MenuLinkContent::load($item->id()); $this->assertTrue($link, 'Link in not allowed menu still exists after saving node'); // Move the menu link back to the Tools menu.