wip #3439 @1

diff --git a/composer.json b/composer.json
index b75de7d1815ed9320471dd51bdff2700a4bb8167..ca78d69eaa92610e6080a8832becb89fd5eb1999 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
         "cviebrock/laravel-elasticsearch": "^4.1",
         "spatie/laravel-honeypot": "^1.4",
         "chrisjean/php-ico": "^1.0",
-        "league/commonmark-ext-table": "^2.1"
+        "swayok/alternative-laravel-cache": "^5.4"
     },
     "require-dev": {
         "filp/whoops": "^2.7",

diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php
index 6b1c704a9cac01b96dbfbacc7fb1df8c3f421c71..027606370edc930e2fcfa464ef4a9c130c824d7f 100644 (file)
--- a/src/app/Magic/Models/Locale.php
+++ b/src/app/Magic/Models/Locale.php
@@ -149,7 +149,7 @@ class Locale extends CubistMagicAbstractModel
         }
 
         $res['active_code'] = $current;
-        $res['active_flag'] = $active->flag;
+        $res['active_flag'] = isset($active) ? $active->flag : '';
         $res['active_name'] = \Cubist\Locale\Locale::translate($current, $current);
         $res['enabled'] = [];
         foreach ($data['locales'] as $locale) {

diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index 77d36836fc9d1751c19c854e9d51d177435703ac..e2e1fafee1c1b1d5bf447b837639494a70a64e6d 100644 (file)
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -171,8 +171,12 @@ class Settings extends CubistMagicTranslatableModel
                 $r->where('variant', $variant);
             }
             $entity = $r->first();
-            $entity->setLocale($locale);
-            self::$_data[$locale] = $entity->getPageData();
+            if (null !== $entity) {
+                $entity->setLocale($locale);
+                self::$_data[$locale] = $entity->getPageData();
+            } else {
+                self::$_data[$locale] = new PageData();
+            }
         }
         return self::$_data[$locale];
     }

diff --git a/src/resources/install/app/Models/Locale.php b/src/resources/install/app/Models/Locale.php
new file mode 100644 (file)
index 0000000..fd75ee0
--- /dev/null
+++ b/src/resources/install/app/Models/Locale.php
@@ -0,0 +1,8 @@
+<?php
+namespace App\Models;
+
+
+class Locale extends \Cubist\Backpack\app\Magic\Models\Locale
+{
+
+}