diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-12 11:11:26 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-12 11:11:26 +0100 |
| commit | 207c09c5113118d053c34360d34d27e754b34bb8 (patch) | |
| tree | fc71b7c396afd0e64b8b794a9bcc9e07f671d94f /lib/private | |
| parent | e99c4d83dc3ec93f35ff6d2ddf9521444156ee50 (diff) | |
| parent | 2aa206e9005f400635c8f32b76bedc2d68848db6 (diff) | |
| download | nextcloud-server-207c09c5113118d053c34360d34d27e754b34bb8.tar.gz nextcloud-server-207c09c5113118d053c34360d34d27e754b34bb8.zip | |
Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link
Do not getShare in deleteShare, it's already there when deleting
Diffstat (limited to 'lib/private')
| -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 12893c26964..7a10d6cba55 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -718,9 +718,9 @@ class Manager implements IManager { * @throws \InvalidArgumentException */ public function deleteShare(\OCP\Share\IShare $share) { - // Just to make sure we have all the info + try { - $share = $this->getShareById($share->getFullId()); + $share->getFullId(); } catch (\UnexpectedValueException $e) { throw new \InvalidArgumentException('Share does not have a full id'); } |