From 9d3de74b2ddbbca73825888035d7ff3d2c82b110 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 22 Dec 2016 10:59:27 +0100 Subject: [PATCH] no need to throw a exception we catch two lines later Signed-off-by: Bjoern Schiessle --- lib/private/Share20/Manager.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ec1866f21c..6eab5e05a2 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1055,11 +1055,10 @@ class Manager implements IManager { public function getShareByToken($token) { $share = null; try { - if(!$this->shareApiAllowLinks()) { - throw new ShareNotFound(); + if($this->shareApiAllowLinks()) { + $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK); + $share = $provider->getShareByToken($token); } - $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK); - $share = $provider->getShareByToken($token); } catch (ProviderException $e) { } catch (ShareNotFound $e) { } @@ -1075,7 +1074,7 @@ class Manager implements IManager { } } - // If it is not a link share try to fetch a federated share by token + // If it is not a link share try to fetch a mail share by token if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) { try { $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_EMAIL);