diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2021-03-19 10:51:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 10:51:21 +0100 |
| commit | 7bf5adb1fa72cc5e8b88714fed5b8d11a5d77379 (patch) | |
| tree | 07bdb2eec2269c0935860d5604a4c70b31040464 /lib | |
| parent | 9e70b83f13321acbe786483a4282c430bc0fde91 (diff) | |
| parent | a9e3d2a10fe4926691065fe9a76e48e6a7e32a08 (diff) | |
| download | nextcloud-server-7bf5adb1fa72cc5e8b88714fed5b8d11a5d77379.tar.gz nextcloud-server-7bf5adb1fa72cc5e8b88714fed5b8d11a5d77379.zip | |
Merge pull request #26200 from nextcloud/bugfix/26197/fix-expiration-validation-confusion
Update user share must use correct expiration validation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share20/Manager.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ce1ec1d60f6..1c875ad0c0a 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -459,7 +459,7 @@ class Manager implements IManager { * @throws \InvalidArgumentException * @throws \Exception */ - protected function validateExpirationDate(IShare $share) { + protected function validateExpirationDateLink(IShare $share) { $expirationDate = $share->getExpirationDate(); if ($expirationDate !== null) { @@ -763,7 +763,7 @@ class Manager implements IManager { ); //Verify the expiration date - $share = $this->validateExpirationDate($share); + $share = $this->validateExpirationDateLink($share); //Verify the password $this->verifyPassword($share->getPassword()); @@ -975,7 +975,7 @@ class Manager implements IManager { if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { //Verify the expiration date - $this->validateExpirationDate($share); + $this->validateExpirationDateInternal($share); $expirationDateUpdated = true; } } elseif ($share->getShareType() === IShare::TYPE_GROUP) { @@ -983,7 +983,7 @@ class Manager implements IManager { if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { //Verify the expiration date - $this->validateExpirationDate($share); + $this->validateExpirationDateInternal($share); $expirationDateUpdated = true; } } elseif ($share->getShareType() === IShare::TYPE_LINK) { @@ -999,7 +999,7 @@ class Manager implements IManager { if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { //Verify the expiration date - $this->validateExpirationDate($share); + $this->validateExpirationDateLink($share); $expirationDateUpdated = true; } } elseif ($share->getShareType() === IShare::TYPE_EMAIL) { |