wait #3947

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index f48f3179d60faa7a4b0323710f6dc48faa7d8575..949cb97c750acef70f5567748e4b4f1fd677a414 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -18,6 +18,7 @@ use Doctrine\DBAL\Schema\Table;
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
@@ -498,7 +499,12 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         $res = new PageData();
         $res->setEntity($this);
         foreach ($this->attributes as $key => $value) {
-            $res->set($key, Json::decodeRecursive($this->getAttributeValue($key), Json::TYPE_ARRAY));
+            $v = $this->getAttributeValue($key);
+            if ($v instanceof Carbon) {
+                $res->set($key, $v);
+                continue;
+            }
+            $res->set($key, Json::decodeRecursive($v, Json::TYPE_ARRAY));
         }
         return $res;
     }