diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-05 16:08:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 16:08:57 +0200 |
| commit | 15cd21d252b9da706be817df77e4c0643b40327f (patch) | |
| tree | a38c9c53c35c3a40fbd8ee2bf2c5d05fac586918 /apps/sharebymail/lib/ShareByMailProvider.php | |
| parent | cebbb1633aab6c1dfb20be9b49212b934c3b5e68 (diff) | |
| parent | 4e3c39c1d1210b6216462e8e26db93f65a4767e6 (diff) | |
| download | nextcloud-server-15cd21d252b9da706be817df77e4c0643b40327f.tar.gz nextcloud-server-15cd21d252b9da706be817df77e4c0643b40327f.zip | |
Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name
Set the meta data before everything
Diffstat (limited to 'apps/sharebymail/lib/ShareByMailProvider.php')
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index e5ae64ba120..9a0678f5fe7 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -384,8 +384,7 @@ class ShareByMailProvider implements IShareProvider { $message = $this->mailer->createMessage(); - $emailTemplate = $this->mailer->createEMailTemplate(); - $emailTemplate->setMetaData('sharebymail.RecipientNotification', [ + $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientNotification', [ 'filename' => $filename, 'link' => $link, 'initiator' => $initiatorDisplayName, @@ -462,8 +461,7 @@ class ShareByMailProvider implements IShareProvider { $message = $this->mailer->createMessage(); - $emailTemplate = $this->mailer->createEMailTemplate(); - $emailTemplate->setMetaData('sharebymail.RecipientPasswordNotification', [ + $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [ 'filename' => $filename, 'password' => $password, 'initiator' => $initiatorDisplayName, @@ -530,8 +528,7 @@ class ShareByMailProvider implements IShareProvider { $bodyPart = $this->l->t("You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.", [$filename, $shareWith, $this->defaults->getName()]); $message = $this->mailer->createMessage(); - $emailTemplate = $this->mailer->createEMailTemplate(); - $emailTemplate->setMetaData('sharebymail.OwnerPasswordNotification', [ + $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [ 'filename' => $filename, 'password' => $password, 'initiator' => $initiatorDisplayName, |