diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-08-29 11:32:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-29 11:32:11 +0200 |
commit | 8c917cbfe0aa33e37d7cff278690b07bf40e1b62 (patch) | |
tree | 8854cb1a193dbe21b0b965543524fa952adf4ac7 /lib | |
parent | 5adc1efe9fef473bb81414682386d1b0563ff859 (diff) | |
parent | be23f7e1de6bd92911cbc6e37df14e015610bdfe (diff) | |
download | nextcloud-server-8c917cbfe0aa33e37d7cff278690b07bf40e1b62.tar.gz nextcloud-server-8c917cbfe0aa33e37d7cff278690b07bf40e1b62.zip |
Merge pull request #6288 from nextcloud/master-6287
Allow the expiration date to be set to null
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Share20/Manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 7139d7646d4..ce0a0bc77f8 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -682,14 +682,14 @@ class Manager implements IManager { * @param string $link link to the file/folder * @param string $initiator user ID of share sender * @param string $shareWith email address of share receiver - * @param \DateTime $expiration + * @param \DateTime|null $expiration * @throws \Exception If mail couldn't be sent */ protected function sendMailNotification($filename, $link, $initiator, $shareWith, - \DateTime $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)); |