소스 검색

Don't duplicate the sentence with the header

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v12.0.0beta1
Joas Schilling 7 년 전
부모
커밋
506c7731a6
No account linked to committer's email address
3개의 변경된 파일8개의 추가작업 그리고 4개의 파일을 삭제
  1. 1
    1
      apps/sharebymail/lib/ShareByMailProvider.php
  2. 5
    2
      lib/private/Mail/EMailTemplate.php
  3. 2
    1
      lib/public/Mail/IEMailTemplate.php

+ 1
- 1
apps/sharebymail/lib/ShareByMailProvider.php 파일 보기

@@ -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]);

+ 5
- 2
lib/private/Mail/EMailTemplate.php 파일 보기

@@ -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;
}
}

/**

+ 2
- 1
lib/public/Mail/IEMailTemplate.php 파일 보기

@@ -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
*/

Loading…
취소
저장