From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 11 Jul 2019 14:24:31 +0000 (+0200)
Subject: #2878
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dcdb061fd3ec5699c5628268ed8705063ca95626;p=cubist_cms-back.git

#2878
---

diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index 52fd06b..196a3f1 100644
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -13,6 +13,7 @@ class CubistPageController extends CubistFrontController
     public function index($slug = 'home')
     {
         $class = CMSPage::getPageClass();
+        /** @var CMSPage $page */
         $page = $class::findBySlug($slug);
 
         if (!$page) {
@@ -21,6 +22,7 @@ class CubistPageController extends CubistFrontController
 
         $this->data['title'] = $page->title;
         $this->data['page'] = $page->getPageData();
+        $page->getUsedTemplate()->injectDataInView($this->data);
         $this->data['body_class'] = 'page-' . Str::slug($page->name);
 
         return view('pages.' . $page->template, $this->data);
diff --git a/src/app/Magic/PageData.php b/src/app/Magic/PageData.php
index a590abf..30eee29 100644
--- a/src/app/Magic/PageData.php
+++ b/src/app/Magic/PageData.php
@@ -169,7 +169,7 @@ class PageData implements \ArrayAccess
     public function getMedia($offset)
     {
         $collection = $this->getMediaCollection($offset);
-        if (!$collection) {
+        if (!$collection || !is_string($collection)) {
             return [];
         }
         $media = $this->getEntity()->getMedia($collection);
diff --git a/src/app/Template/TemplateAbstract.php b/src/app/Template/TemplateAbstract.php
index eaaf987..5d3096e 100644
--- a/src/app/Template/TemplateAbstract.php
+++ b/src/app/Template/TemplateAbstract.php
@@ -17,7 +17,7 @@ class TemplateAbstract
 
     protected $_fields = [];
 
-    protected $_virtual=false;
+    protected $_virtual = false;
 
     public function __construct()
     {
@@ -129,7 +129,17 @@ class TemplateAbstract
     /**
      * @return bool
      */
-    public function isVirtual(){
+    public function isVirtual()
+    {
         return $this->_virtual;
     }
+
+
+    /**
+     * @param $data array
+     */
+    public function injectDataInView(&$data)
+    {
+
+    }
 }