Merge branch '2.1' of github.com:doublethreedigital/runway into 2.1

statamic-rad-pack · Jul 30, 2021 · c6d579a · c6d579a
2 parents 12dd24e + 85a3b7d
commit c6d579a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Http/Controllers/ResourceController.php b/src/Http/Controllers/ResourceController.php
@@ -75,7 +75,7 @@ public function store(StoreRequest $request, $resourceHandle)
 
             $processedValue = $field->fieldtype()->process($request->get($fieldKey));
 
-            if (is_array($processedValue)) {
+            if (is_array($processedValue) && !$record->hasCast($fieldKey, ['array', 'collection', 'object', 'encrypted:array', 'encrypted:collection', 'encrypted:object'])) {
                 $processedValue = json_encode($processedValue);
             }
 
@@ -158,7 +158,7 @@ public function update(UpdateRequest $request, $resourceHandle, $record)
 
             $processedValue = $field->fieldtype()->process($request->get($fieldKey));
 
-            if (is_array($processedValue)) {
+            if (is_array($processedValue) && !$record->hasCast($fieldKey, ['array', 'collection', 'object', 'encrypted:array', 'encrypted:collection', 'encrypted:object'])) {
                 $processedValue = json_encode($processedValue);
             }