From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 15 Jul 2019 13:22:23 +0000 (+0200)
Subject: fix #2886 @0:20
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3b44e55c46b5acb7fec0e06d4b5bfbf2ea2056db;p=cubist_cms-back.git

fix #2886 @0:20
---

diff --git a/src/resources/views/fields/tags.blade.php b/src/resources/views/fields/tags.blade.php
index 4ebc536..bde347a 100644
--- a/src/resources/views/fields/tags.blade.php
+++ b/src/resources/views/fields/tags.blade.php
@@ -1,22 +1,23 @@
-@php
-    $values=old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '[]';
-    if(!is_array($values)){
-    $values=json_decode($values);
+<?php
+$values = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? [];
+if(null===$values || $values){
+    $values=[];
+}
+if (!is_array($values)) {
+    $values = json_decode($values, true);
+}
+if (!$values) {
+    $values = [];
+}
+$normalizedValues = [];
+foreach ($values as $value) {
+    if (is_object($value)) {
+        $value = $value->value;
     }
-    if(!$values){
-       $values=[];
-    }
-    $normalizedValues=[];
-    foreach ($values as $value) {
-        if(is_object($value)){
-            $value=$value->value;
-        }
-        $normalizedValues[]=$value;
-    }
-    $values=$normalizedValues;
-@endphp
-
-<!-- select2 tags -->
+    $normalizedValues[] = $value;
+}
+$values = $normalizedValues;
+?><!-- select2 tags -->
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>
     @include('crud::inc.field_translatable_icon')