Merge pull request #11338 from rubo77/password-br

sharebymail: Add linebreak before password
nextcloud · Oct 3, 2018 · 71072a0 · 71072a0
2 parents 213d43f + a3849e6
commit 71072a0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -479,7 +479,8 @@ protected function sendPassword(IShare $share, $password) {
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
 		$emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
-		$emailTemplate->addBodyText($this->l->t('It is protected with the following password: %s', [$password]));
+		$emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
+		$emailTemplate->addBodyText($password);
 
 		// The "From" contains the sharers name
 		$instanceName = $this->defaults->getName();
@@ -600,7 +601,8 @@ protected function sendPasswordToOwner(IShare $share, $password) {
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
 		$emailTemplate->addBodyText($bodyPart);
-		$emailTemplate->addBodyText($this->l->t('This is the password: %s', [$password]));
+		$emailTemplate->addBodyText($this->l->t('This is the password:'));
+		$emailTemplate->addBodyText($password);
 		$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
 		$emailTemplate->addFooter();