fix logic bug

cklmercer · Jul 18, 2016 · b12209a · b12209a
1 parent a7259db
commit b12209a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/HasSettings.php b/src/HasSettings.php
@@ -18,7 +18,7 @@ public static function bootHasSettings()
         });
 
         self::saving(function ($model) {
-            if (property_exists($model, 'allowedSettings') && is_array($model->allowedSettings)) {
+            if ($model->settings && property_exists($model, 'allowedSettings') && is_array($model->allowedSettings)) {
                 $model->settings = array_only($model->settings, $model->allowedSettings);
             }
         });