Bug fixes

IsraelOrtuno · Oct 8, 2018 · 9bdf84f · 9bdf84f
1 parent c085e3c
commit 9bdf84f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Permalink.php b/src/Permalink.php
@@ -248,11 +248,16 @@ public static function actionMap(array $map = null, $merge = true)
      */
     public function setSeoAttribute($value)
     {
-        $this->attributes['seo'] = json_encode(array_undot(
-            array_filter(array_dot($value), function ($item) {
-                return ! is_null($item);
-            })
-        ));
+        if (! is_null($value)) {
+            $value = json_encode(array_undot(
+                array_filter(array_dot($value), function ($item) {
+                    return ! is_null($item);
+                })
+            ));
+        }
+
+
+        $this->attributes['seo'] = $value;
     }
 
     /**

diff --git a/src/PermalinkManager.php b/src/PermalinkManager.php
@@ -87,7 +87,7 @@ protected function getCurrentPermalink()
             return $permalink;
         }
 
-        return $this->staticPermalinks[$route->getName()] ?? null;
+        return (new Permalink)->fill(['seo' => $this->staticPermalinks[$route->getName()] ?? null]);
     }
 
     /**