Revert unnecessary change

getkirby · Nov 11, 2024 · fc76eb2 · fc76eb2
1 parent 49a67de
commit fc76eb2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Form/Form.php b/src/Form/Form.php
@@ -122,17 +122,17 @@ public function data($defaults = false, bool $includeNulls = true): array
 		$data = $this->values;
 
 		foreach ($this->fields as $field) {
-			if ($field->unset() === true) {
-				$data[$field->name()] = null;
+			if ($field->isSaveable() === false || $field->unset() === true) {
+				if ($includeNulls === true) {
+					$data[$field->name()] = null;
+				} else {
+					unset($data[$field->name()]);
+				}
 			} else {
 				$data[$field->name()] = $field->toStoredValue($defaults);
 			}
 		}
 
-		if ($includeNulls === false) {
-			$data = array_filter($data, fn ($value) => $value !== null);
-		}
-
 		return $data;
 	}