mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8365 from nupplaphil/bug/mail_fix_text

Browse source 
Mail: Remove redundant body creation in case of only a preamble is set
This commit is contained in:
Hypolite Petovan 2020-03-07 06:42:09 -05:00 committed by GitHub
parent 8487e0be17 1d15f6f848
commit 79eeb40969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Util/EMailer/SystemMailBuilder.php
View file

@ -36,11 +36,11 @@ use Psr\Log\LoggerInterface;
class SystemMailBuilder extends MailBuilder class SystemMailBuilder extends MailBuilder
{ {
/** @var string */ /** @var string */
protected $subject; protected $subject = '';
/** @var string */ /** @var string */
protected $preamble; protected $preamble = '';
/** @var string */ /** @var string */
protected $body; protected $body = '';
/** @var string */ /** @var string */
protected $siteAdmin; protected $siteAdmin;
@ -63,18 +63,14 @@ class SystemMailBuilder extends MailBuilder
/** /**
* Adds a message * Adds a message
* *
* @param string $subject The subject of the email * @param string $subject The subject of the email
* @param string $preamble The preamble of the email * @param string $preamble The preamble of the email
* @param string|null $body The body of the email (if not set, the preamble will get used as body) * @param string $body The body of the email (optional)
* *
* @return static * @return static
*/ */
public function withMessage(string $subject, string $preamble, string $body = null) public function withMessage(string $subject, string $preamble, string $body = '')
{ {
if (!isset($body)) {
$body = $preamble;
}
$this->subject = $subject; $this->subject = $subject;
$this->preamble = $preamble; $this->preamble = $preamble;
$this->body = $body; $this->body = $body;
@ -98,15 +94,13 @@ class SystemMailBuilder extends MailBuilder
*/ */
protected function getHtmlMessage() protected function getHtmlMessage()
{ {
$htmlVersion = BBCode::convert($this->body);
// load the template for private message notifications // load the template for private message notifications
$tpl = Renderer::getMarkupTemplate('email/system/html.tpl'); $tpl = Renderer::getMarkupTemplate('email/system/html.tpl');
return Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [
'$preamble' => str_replace("\n", "<br>\n", $this->preamble), '$preamble' => str_replace("\n", "<br>\n", $this->preamble),
'$thanks' => $this->l10n->t('thanks'), '$thanks' => $this->l10n->t('thanks'),
'$site_admin' => $this->siteAdmin, '$site_admin' => $this->siteAdmin,
'$htmlversion' => $htmlVersion, '$htmlversion' => BBCode::convert($this->body),
]); ]);
} }
@ -117,15 +111,13 @@ class SystemMailBuilder extends MailBuilder
*/ */
protected function getPlaintextMessage() protected function getPlaintextMessage()
{ {
$textVersion = BBCode::toPlaintext($this->body);
// load the template for private message notifications // load the template for private message notifications
$tpl = Renderer::getMarkupTemplate('email/system/text.tpl'); $tpl = Renderer::getMarkupTemplate('email/system/text.tpl');
return Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [
'$preamble' => $this->preamble, '$preamble' => $this->preamble,
'$thanks' => $this->l10n->t('thanks'), '$thanks' => $this->l10n->t('thanks'),
'$site_admin' => $this->siteAdmin, '$site_admin' => $this->siteAdmin,
'$textversion' => $textVersion, '$textversion' => BBCode::toPlaintext($this->body),
]); ]);
} }
} }