fix #3263 @0:10

diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index b437c0aa013adc7228a4326c0dff4574fff9e2f0..77d4578863587bcffe0cd8c947f6e9e62e1cb887 100644 (file)
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -128,6 +128,9 @@ class CMSPage extends CubistMagicNestedModel
             $template = TemplateAbstract::getTemplateIntanceByName($template);
         }
 
+        if (null === $template) {
+            return;
+        }
 
         $this->_usedTemplate = $template;
 

diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php
index 76b9af9a5da65d5518daedc40807064613881710..d639a3f489189f63e3d37087ce2bffb4f9cac904 100644 (file)
--- a/src/app/Magic/Models/CubistMagicTranslatableModel.php
+++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php
@@ -51,7 +51,12 @@ class CubistMagicTranslatableModel extends CubistMagicAbstractModel
     {
         if ($key !== null) {
             $this->guardAgainstNonTranslatableAttribute($key);
-            $v = $this->getAttributes()[$key];
+            $attrs = $this->getAttributes();
+            if (!isset($attrs[$key])) {
+                return [];
+            }
+
+            $v = $attrs[$key];
             if (is_string($v)) {
                 $v = json_decode($v ?? '' ?: '{}', true);
             }