Make menu-links absolute (#4008)

thedevdojo · Mar 20, 2019 · 1107e32 · 1107e32
1 parent 9428462
commit 1107e32
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Models/Menu.php b/src/Models/Menu.php
@@ -101,20 +101,19 @@ private static function processItems($items)
             // Translate title
             $item->title = $item->getTranslatedAttribute('title');
             // Resolve URL/Route
-            $item->href = $item->link();
+            $item->href = $item->link(true);
 
-            if (url($item->href) == url()->current() && $item->href != '') {
+            if ($item->href == url()->current() && $item->href != '') {
                 // The current URL is exactly the URL of the menu-item
                 $item->active = true;
-            } elseif (starts_with(url()->current(), Str::finish(url($item->href), '/'))) {
+            } elseif (starts_with(url()->current(), Str::finish($item->href, '/'))) {
                 // The current URL is "below" the menu-item URL. For example "admin/posts/1/edit" => "admin/posts"
                 $item->active = true;
             }
-
-            if (($item->href == '' || url($item->href) == route('voyager.dashboard')) && $item->children->count() > 0) {
+            if (($item->href == url('') || $item->href == route('voyager.dashboard')) && $item->children->count() > 0) {
                 // Exclude sub-menus
                 $item->active = false;
-            } elseif (url($item->href) == route('voyager.dashboard') && url()->current() != route('voyager.dashboard')) {
+            } elseif ($item->href == route('voyager.dashboard') && url()->current() != route('voyager.dashboard')) {
                 // Exclude dashboard
                 $item->active = false;
             }