fix(filefield): null passed to json_decode deprecated

btry · btry · commit 6f56484e029a · 2022-04-07T08:58:22.000+02:00
diff --git a/inc/field/filefield.class.php b/inc/field/filefield.class.php
@@ -100,11 +100,15 @@ public function serializeValue(): string {
    }
 
    public function deserializeValue($value) {
+      $this->uploadData = [];
+      $this->value = __('No attached document', 'formcreator');
+      if ($value === null) {
+         return;
+      }
       $this->uploadData = json_decode($value, true);
       if ($this->uploadData === null) {
          $this->uploadData = [];
       }
-      $this->value = __('No attached document', 'formcreator');;
       if (count($this->uploadData) > 0) {
          $this->value = __('Attached document', 'formcreator');
       }

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,15 @@ public function serializeValue(): string {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public function deserializeValue($value) {`
	`103`	`+ $this->uploadData = [];`
	`104`	`+ $this->value = __('No attached document', 'formcreator');`
	`105`	`+ if ($value === null) {`
	`106`	`+ return;`
	`107`	`+ }`
`103`	`108`	`$this->uploadData = json_decode($value, true);`
`104`	`109`	`if ($this->uploadData === null) {`
`105`	`110`	`$this->uploadData = [];`
`106`	`111`	`}`
`107`		`- $this->value = __('No attached document', 'formcreator');;`
`108`	`112`	`if (count($this->uploadData) > 0) {`
`109`	`113`	`$this->value = __('Attached document', 'formcreator');`
`110`	`114`	`}`