Remove redundant body creation in case of only a preamble is set

diff --git a/src/Util/EMailer/SystemMailBuilder.php b/src/Util/EMailer/SystemMailBuilder.php
index 59ebb59b18f5528de6e18b5caae65321697f2fa0..3d715906bdfa728f6818a2af32e48580f7599048 100644 (file)
--- a/src/Util/EMailer/SystemMailBuilder.php
+++ b/src/Util/EMailer/SystemMailBuilder.php
@@ -36,11 +36,11 @@ use Psr\Log\LoggerInterface;
 class SystemMailBuilder extends MailBuilder
 {
        /** @var string */
-       protected $subject;
+       protected $subject = '';
        /** @var string */
-       protected $preamble;
+       protected $preamble = '';
        /** @var string */
-       protected $body;
+       protected $body = null;
 
        /** @var string */
        protected $siteAdmin;
@@ -71,10 +71,6 @@ class SystemMailBuilder extends MailBuilder
         */
        public function withMessage(string $subject, string $preamble, string $body = null)
        {
-               if (!isset($body)) {
-                       $body = $preamble;
-               }
-
                $this->subject  = $subject;
                $this->preamble = $preamble;
                $this->body     = $body;
@@ -98,7 +94,7 @@ class SystemMailBuilder extends MailBuilder
         */
        protected function getHtmlMessage()
        {
-               $htmlVersion = BBCode::convert($this->body);
+               $htmlVersion = !empty($this->body) ? BBCode::convert($this->body) : '';
 
                // load the template for private message notifications
                $tpl = Renderer::getMarkupTemplate('email/system/html.tpl');
@@ -117,7 +113,7 @@ class SystemMailBuilder extends MailBuilder
         */
        protected function getPlaintextMessage()
        {
-               $textVersion = BBCode::toPlaintext($this->body);
+               $textVersion = !empty($this->body) ? BBCode::toPlaintext($this->body) : '';
 
                // load the template for private message notifications
                $tpl = Renderer::getMarkupTemplate('email/system/text.tpl');