From ef3a251634ee13d5ec05ad0655761fa6b108bc5f Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 10 Jul 2019 21:25:24 +0200
Subject: [PATCH] wip #2878 @2

---
 src/app/Http/Controllers/CubistPageController.php | 8 ++++----
 src/app/Magic/Menu/PageItem.php                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index 833b525..6323119 100644
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -25,13 +25,13 @@ class CubistPageController extends CubistFrontController
         return view('pages.' . $page->template, $this->data);
     }
 
-    public function catchall($main = '', $subs = [])
+    public function catchall($main = '', $subs = '')
     {
-        $path = trim($main . '/' . implode($subs), '/');
+
+        $path = trim($main . '/' . $subs, '/');
         if (!$path) {
             $path = 'home';
         }
-
         $nav = Menu::getNavigation();
         $item = $nav->findItemByHref($path);
         if (null === $item) {
@@ -40,6 +40,6 @@ class CubistPageController extends CubistFrontController
 
         $c = $item->getController();
 
-        redirect()->action($c['controller'] . '@' . $c['action'], $c['params']);
+        return call_user_func_array([app('App\Http\Controllers\\' . $c['controller']), $c['action']], $c['params']);
     }
 }
diff --git a/src/app/Magic/Menu/PageItem.php b/src/app/Magic/Menu/PageItem.php
index d835ea0..2b1c4e7 100644
--- a/src/app/Magic/Menu/PageItem.php
+++ b/src/app/Magic/Menu/PageItem.php
@@ -83,6 +83,6 @@ class PageItem extends Item
      */
     public function getController(): array
     {
-        return ['controller' => 'PageController', 'action' => 'index', 'params' => [$this->getSlug()]];
+        return ['controller' => 'PageController', 'action' => 'index', 'params' => ['slug' => $this->getSlug()]];
     }
 }
-- 
2.39.5