Merge pull request #12269 from annando/api-edit

[friendica.git] / src / Object / Email.php

diff --git a/src/Object/Email.php b/src/Object/Email.php
index 57eb0c17e9b155099521b81d23007de4016f720c..fdde4e96ddd751a329f4e16e434acdaddd79607f 100644 (file)
--- a/src/Object/Email.php
+++ b/src/Object/Email.php
@@ -110,12 +110,12 @@ class Email implements IEmail
        /**
         * {@inheritDoc}
         */
-       public function getMessage(bool $plain = false)
+       public function getMessage(bool $plain = false): string
        {
                if ($plain) {
                        return $this->msgText;
                } else {
-                       return $this->msgHtml;
+                       return $this->msgHtml ?? '';
                }
        }
 
@@ -200,6 +200,7 @@ class Email implements IEmail
        /**
         * @inheritDoc
         */
+       #[\ReturnTypeWillChange]
        public function jsonSerialize()
        {
                return $this->toArray();