Upgrade to 3.6.0

2021-11-16 14:53:37 +01:00
parent 7388fa4d24
commit 92b7a330fa
318 changed files with 20017 additions and 6878 deletions
--- a/kirby/src/Form/Field.php
+++ b/kirby/src/Form/Field.php
@@ -238,7 +238,7 @@ class Field extends Component
                'help' => function () {
                    /** @var \Kirby\Form\Field $this */
                    if ($this->help) {
-                        $help = $this->model()->toString($this->help);
+                        $help = $this->model()->toSafeString($this->help);
                        $help = $this->kirby()->kirbytext($help);
                        return $help;
                    }
@@ -441,7 +441,7 @@ class Field extends Component
        ksort($array);

        return array_filter($array, function ($item) {
-            return $item !== null;
+            return $item !== null && is_object($item) === false;
        });
    }