wip

jqhph · Dec 23, 2020 · 6e67eeb · 6e67eeb
1 parent d1b0028
commit 6e67eeb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Grid/Column.php b/src/Grid/Column.php
@@ -537,15 +537,21 @@ public function fill($data)
 
             $this->original = Arr::get($this->originalModel, $this->name);
 
-            $this->value = $value = $this->htmlEntityEncode(Arr::get($row, $this->name));
+            $this->value = $value = $this->htmlEntityEncode($original = Arr::get($row, $this->name));
+
+            if ($original === null) {
+                $original = (string) $original;
+            }
 
             $this->processConditions();
 
             if ($this->hasDisplayCallbacks()) {
                 $value = $this->callDisplayCallbacks($this->original);
             }
 
-            Helper::arraySet($row, $this->name, $value);
+            if ($original !== $value) {
+                Helper::arraySet($row, $this->name, $value);
+            }
         }
 
         $this->value = $value ?? null;