#2878

diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index b26cc3e53af75af9e1f8fa92eacb21fce57a49f8..a5efda3ae7af527146afc0d7f5ebd21954114d74 100644 (file)
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -4,6 +4,7 @@
 namespace Cubist\Backpack\app\Http\Controllers;
 
 use App\Models\Page;
+use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\Settings;
 use Illuminate\Routing\Controller as BaseController;
 
@@ -14,6 +15,7 @@ class CubistFrontController extends BaseController
     public function __construct()
     {
         $this->data['global'] = Settings::find(1)->getPageData();
+        $this->data['nav'] = Menu::getNavigation();
     }
 
 

diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index ab86203d58381c36bb11eaeffb519712bb7dda76..52fd06beb8ddc283ce03db4753268d8c356bae2e 100644 (file)
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -5,6 +5,7 @@ namespace Cubist\Backpack\app\Http\Controllers;
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\CMSPage;
 use Illuminate\Support\Str;
+use Illuminate\View\View;
 
 class CubistPageController extends CubistFrontController
 {
@@ -40,6 +41,6 @@ class CubistPageController extends CubistFrontController
 
         $c = $item->getController();
 
-        return call_user_func_array([app('App\Http\Controllers\\' . $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/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 474ed8b1be68e2dc8c17abbe784dd5348011fc1f..5c587f6f63e6170c982faee717c64f1892c0102f 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -527,7 +527,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         $res = new PageData();
         $res->setEntity($this);
         foreach ($this->attributes as $key => $value) {
-            $res->set($key, Json::decodeRecursive($value, Json::TYPE_ARRAY));
+            $res->set($key, Json::decodeRecursive($this->getAttributeValue($key), Json::TYPE_ARRAY));
         }
         return $res;
     }