diff --git a/app/CMS/Widgets/Menu/Presenters/Menu.php b/app/CMS/Widgets/Menu/Presenters/Menu.php index 040dda3e..b65702f9 100644 --- a/app/CMS/Widgets/Menu/Presenters/Menu.php +++ b/app/CMS/Widgets/Menu/Presenters/Menu.php @@ -6,9 +6,7 @@ use App\CMS\Contracts\Widgets\WidgetRenderer; use App\CMS\Widgets\Menu\Menu as WidgetMenu; use App\Models\Widgets\Widget; use App\Models\Widgets\WidgetType; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\App; -use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Route; class Menu implements WidgetRenderer @@ -36,8 +34,8 @@ class Menu implements WidgetRenderer return $a->order - $b->order; }); - $route = Request::route() - ->getName(); + $routeName = Route::current() + ->getName(); $parameters = Route::current() ->parameters(); @@ -55,7 +53,7 @@ class Menu implements WidgetRenderer } $page = $pages[$pageId]; - $active = ($page->isHomepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url); + $active = ($page->isHomepage && $routeName == 'page.index') || ($routeName == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url); $route = $page->isHomepage ? route('page.index') : route('page.content', ['url' => $page->url]); $code .= '