Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-29 12:32:11 +0300
committerGitHub <noreply@github.com>2017-08-29 12:32:11 +0300
commit8c917cbfe0aa33e37d7cff278690b07bf40e1b62 (patch)
tree8854cb1a193dbe21b0b965543524fa952adf4ac7 /apps
parent5adc1efe9fef473bb81414682386d1b0563ff859 (diff)
parentbe23f7e1de6bd92911cbc6e37df14e015610bdfe (diff)
Merge pull request #6288 from nextcloud/master-6287
Allow the expiration date to be set to null
Diffstat (limited to 'apps')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 836f230290c..c88c2fdd0f3 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -377,7 +377,7 @@ class ShareByMailProvider implements IShareProvider {
$link,
$initiator,
$shareWith,
- $expiration) {
+ \DateTime $expiration = null) {
$initiatorUser = $this->userManager->get($initiator);
$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
$subject = (string)$this->l->t('%s shared »%s« with you', array($initiatorDisplayName, $filename));