wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't duplicate the sentence with the header

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-04-12 11:52:33 +02:00 committed by Bjoern Schiessle
parent d0bae447fb
commit 506c7731a6
No known key found for this signature in database
GPG key ID: 2378A753E2BF04F6
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/sharebymail/lib/ShareByMailProvider.php
View file

@ -264,7 +264,7 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate = $this->mailer->createEMailTemplate();
$emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('%s shared »%s« with you', [$ownerDisplayName, $filename]));
$emailTemplate->addHeading($this->l->t('%s shared »%s« with you', [$ownerDisplayName, $filename]), false);
if ($owner === $initiator) {
$text = $this->l->t('%s shared »%s« with you.', [$ownerDisplayName, $filename]);

7
lib/private/Mail/EMailTemplate.php
View file

@ -353,7 +353,8 @@ EOF;
* Adds a paragraph to the body of the email
*
* @param string $text
* @param string $plainText Text that is used in the plain text email - if empty the $text is used
* @param string|bool $plainText Text that is used in the plain text email
* if empty the $text is used, if false none will be used
*/
public function addBodyText($text, $plainText = '') {
if ($this->footerAdded) {
@ -369,7 +370,9 @@ EOF;
}
$this->htmlBody .= vsprintf($this->bodyText, [htmlspecialchars($text)]);
$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
if ($plainText !== false) {
$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
}
}
/**

3
lib/public/Mail/IEMailTemplate.php
View file

@ -72,7 +72,8 @@ interface IEMailTemplate {
* Adds a paragraph to the body of the email
*
* @param string $text
* @param string $plainText Text that is used in the plain text email - if empty the $text is used
* @param string|bool $plainText Text that is used in the plain text email
* if empty the $text is used, if false none will be used
*
* @since 12.0.0
*/