Fix menu item matcher when using pretty URLs and submenus

EasyCorp · Dec 5, 2024 · beff6b7 · beff6b7
1 parent 7d6c711
commit beff6b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Menu/MenuItemMatcher.php b/src/Menu/MenuItemMatcher.php
@@ -200,9 +200,9 @@ private function doMarkSelectedPrettyUrlsMenuItem(array $menuItems, Request $req
 
             // compare the ending of the URL instead of a strict equality because link URLs can be absolute URLs
             if (str_ends_with($menuItemUrl, $currentRequestUriWithoutQueryString)
-                || str_ends_with($menuItemUrl, $currentRequestUriWithoutAction)
+                || ('' !== $currentRequestUriWithoutAction && str_ends_with($menuItemUrl, $currentRequestUriWithoutAction))
                 || str_ends_with($menuItemUrlWithoutQueryString, $currentRequestUriWithoutQueryString)
-                || str_ends_with($menuItemUrlWithoutQueryString, $currentRequestUriWithoutAction)) {
+                || ('' !== $currentRequestUriWithoutAction && str_ends_with($menuItemUrlWithoutQueryString, $currentRequestUriWithoutAction))) {
                 $menuItemDto->setSelected(true);
 
                 return $menuItems;