Upgrade to 3.6.3

kirby/src/Email/Body.php

@@ -12,7 +12,7 @@ use Kirby\Toolkit\Properties;
  * @author    Bastian Allgeier <bastian@getkirby.com>,
  *            Nico Hoffmann <nico@getkirby.com>
  * @link      https://getkirby.com
- * @copyright Bastian Allgeier GmbH
+ * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
 class Body
@@ -20,12 +20,12 @@ class Body
     use Properties;
 
     /**
-     * @var string|null
+     * @var string
      */
     protected $html;
 
     /**
-     * @var string|null
+     * @var string
      */
     protected $text;
 
@@ -42,21 +42,21 @@ class Body
     /**
      * Returns the HTML content of the email body
      *
-     * @return string|null
+     * @return string
      */
     public function html()
     {
-        return $this->html;
+        return $this->html ?? '';
     }
 
     /**
      * Returns the plain text content of the email body
      *
-     * @return string|null
+     * @return string
      */
     public function text()
     {
-        return $this->text;
+        return $this->text ?? '';
     }
 
     /**

kirby/src/Email/Email.php

@@ -14,7 +14,7 @@ use Kirby\Toolkit\V;
  * @author    Bastian Allgeier <bastian@getkirby.com>,
  *            Nico Hoffmann <nico@getkirby.com>
  * @link      https://getkirby.com
- * @copyright Bastian Allgeier GmbH
+ * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
 class Email
@@ -211,7 +211,7 @@ class Email
      */
     public function isHtml()
     {
-        return $this->body()->html() !== null;
+        return empty($this->body()->html()) === false;
     }
 
     /**

kirby/src/Email/PHPMailer.php

@@ -12,7 +12,7 @@ use PHPMailer\PHPMailer\PHPMailer as Mailer;
  * @author    Bastian Allgeier <bastian@getkirby.com>,
  *            Nico Hoffmann <nico@getkirby.com>
  * @link      https://getkirby.com
- * @copyright Bastian Allgeier GmbH
+ * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  */
 class PHPMailer extends Email