Upgrade to 3.0.2

2019-02-19 16:39:58 +01:00
parent f76ee1bb14
commit 8e3d86a590
44 changed files with 638 additions and 264 deletions
--- a/kirby/src/Cms/Form.php
+++ b/kirby/src/Cms/Form.php
@@ -41,9 +41,17 @@ class Form extends BaseForm
    {
        // get the original model data
        $original = $model->content()->toArray();
+        $values   = $props['values'] ?? [];
+
+        // convert closures to values
+        foreach ($values as $key => $value) {
+            if (is_a($value, 'Closure') === true) {
+                $values[$key] = $value($original[$key] ?? null);
+            }
+        }

        // set a few defaults
-        $props['values'] = array_merge($original, $props['values'] ?? []);
+        $props['values'] = array_merge($original, $values);
        $props['fields'] = $props['fields'] ?? [];
        $props['model']  = $model;