summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-29 17:58:00 +0200
committerGitHub <noreply@github.com>2017-08-29 17:58:00 +0200
commitd86bb5aed831376ebb5091f3da0d7ad4178c380e (patch)
treedd5df58348d690f22d4d77ea1e38ecf70bcde7b4
parentb2dd7bf0457a3a07ddca5066e64fb4e8b820cd5b (diff)
parent3cfe91bf0f0a2bf9c2b15c31c94037572e0ea331 (diff)
downloadnextcloud-server-d86bb5aed831376ebb5091f3da0d7ad4178c380e.tar.gz
nextcloud-server-d86bb5aed831376ebb5091f3da0d7ad4178c380e.zip
Merge pull request #6301 from nextcloud/master-add-share-with
Add shareWith to email template metadata
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php1
-rw-r--r--lib/private/Share20/Manager.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index c88c2fdd0f3..0b8381c204e 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -390,6 +390,7 @@ class ShareByMailProvider implements IShareProvider {
'link' => $link,
'initiator' => $initiatorDisplayName,
'expiration' => $expiration,
+ 'shareWith' => $shareWith,
]);
$emailTemplate->addHeader();
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index ce0a0bc77f8..46e3bd75c5c 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -702,6 +702,7 @@ class Manager implements IManager {
'link' => $link,
'initiator' => $initiatorDisplayName,
'expiration' => $expiration,
+ 'shareWith' => $shareWith,
]);
$emailTemplate->addHeader();