mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow the expiration date to be set to null 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-08-28 17:39:29 +02:00
parent 8e4085526d
commit be23f7e1de
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -377,7 +377,7 @@ class ShareByMailProvider implements IShareProvider {
$link, $link,
$initiator, $initiator,
$shareWith, $shareWith,
$expiration) { \DateTime $expiration = null) {
$initiatorUser = $this->userManager->get($initiator); $initiatorUser = $this->userManager->get($initiator);
$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
$subject = (string)$this->l->t('%s shared »%s« with you', array($initiatorDisplayName, $filename)); $subject = (string)$this->l->t('%s shared »%s« with you', array($initiatorDisplayName, $filename));

4
lib/private/Share20/Manager.php
View File

@ -682,14 +682,14 @@ class Manager implements IManager {
* @param string $link link to the file/folder * @param string $link link to the file/folder
* @param string $initiator user ID of share sender * @param string $initiator user ID of share sender
* @param string $shareWith email address of share receiver * @param string $shareWith email address of share receiver
* @param \DateTime $expiration * @param \DateTime|null $expiration
* @throws \Exception If mail couldn't be sent * @throws \Exception If mail couldn't be sent
*/ */
protected function sendMailNotification($filename, protected function sendMailNotification($filename,
$link, $link,
$initiator, $initiator,
$shareWith, $shareWith,
\DateTime $expiration) { \DateTime $expiration = null) {
$initiatorUser = $this->userManager->get($initiator); $initiatorUser = $this->userManager->get($initiator);
$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
$subject = (string)$this->l->t('%s shared »%s« with you', array($initiatorDisplayName, $filename)); $subject = (string)$this->l->t('%s shared »%s« with you', array($initiatorDisplayName, $filename));