Upgrade to 3.2.4

2019-09-03 11:01:57 +02:00
parent f79bc3248c
commit ff9b5b1861
25 changed files with 1053 additions and 140 deletions
--- a/kirby/src/Cms/Email.php
+++ b/kirby/src/Cms/Email.php
@@ -40,7 +40,9 @@ class Email
        $this->props = array_merge($this->preset, $props);

        // add transport settings
-        $this->props['transport'] = $this->options['transport'] ?? [];
+        if (isset($this->props['transport']) === false) {
+            $this->props['transport'] = $this->options['transport'] ?? [];
+        }

        // transform model objects to values
        foreach (static::$transform as $prop => $model) {