diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-05 12:50:00 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-06 14:53:43 +0100 |
| commit | 26280e1f1965cd50325a05715989b1c0f7e508d0 (patch) | |
| tree | f78ba6a0ba1df3a48d573bf837ca462d71407372 /apps | |
| parent | 527b434cd270b46bd47559760023385ba83024ba (diff) | |
| download | nextcloud-server-26280e1f1965cd50325a05715989b1c0f7e508d0.tar.gz nextcloud-server-26280e1f1965cd50325a05715989b1c0f7e508d0.zip | |
[Sharing 2.0] Add L10N instance to manager for translated errors
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/api/ocssharewrapper.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/api/share20ocs.php | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/api/ocssharewrapper.php index 2896f3fbf01..4640f4ea185 100644 --- a/apps/files_sharing/api/ocssharewrapper.php +++ b/apps/files_sharing/api/ocssharewrapper.php @@ -39,7 +39,8 @@ class OCSShareWrapper { \OC::$server->getSecureRandom(), \OC::$server->getHasher(), \OC::$server->getMountManager(), - \OC::$server->getGroupManager() + \OC::$server->getGroupManager(), + \OC::$server->getL10N('core') ), \OC::$server->getGroupManager(), \OC::$server->getUserManager(), diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 69e2f570499..003c028bf97 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -268,9 +268,9 @@ class Share20OCS { } $share->setPermissions( - \OCP\Constants::PERMISSION_READ | - \OCP\Constants::PERMISSION_CREATE | - \OCP\Constants::PERMISSION_UPDATE + \OCP\Constants::PERMISSION_READ | + \OCP\Constants::PERMISSION_CREATE | + \OCP\Constants::PERMISSION_UPDATE ); } else { $share->setPermissions(\OCP\Constants::PERMISSION_READ); @@ -303,7 +303,10 @@ class Share20OCS { try { $share = $this->shareManager->createShare($share); - } catch (\Exception $e) { + } catch (\OC\HintException $e) { + $code = $e->getCode() === 0 ? 403 : $e->getCode(); + return new \OC_OCS_Result(null, $code, $e->getHint()); + }catch (\Exception $e) { return new \OC_OCS_Result(null, 403, $e->getMessage()); } |