Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / menu_link_content / menu_link_content.module

diff --git a/web/core/modules/menu_link_content/menu_link_content.module b/web/core/modules/menu_link_content/menu_link_content.module
index f94a139d4623a2ab6f16c4f2bededfccfd28a96c..a5541cda26199e559a2975630a500f92c6f70fbb 100644 (file)
--- a/web/core/modules/menu_link_content/menu_link_content.module
+++ b/web/core/modules/menu_link_content/menu_link_content.module
@@ -89,10 +89,17 @@ function menu_link_content_path_delete($path) {
 function menu_link_content_entity_predelete(EntityInterface $entity) {
   /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
   $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
+  $entity_type_id = $entity->getEntityTypeId();
   foreach ($entity->uriRelationships() as $rel) {
     $url = $entity->toUrl($rel);
+    $route_parameters = $url->getRouteParameters();
+    if (!isset($route_parameters[$entity_type_id])) {
+      // Do not delete links which do not relate to this exact entity. For
+      // example, "collection", "add-form", etc.
+      continue;
+    }
     // Delete all MenuLinkContent links that point to this entity route.
-    $result = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters());
+    $result = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $route_parameters);
 
     if ($result) {
       foreach ($result as $id => $instance) {