From 59e43b48282894f74fe8cd381ccdf0b1bb8cc536 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 5 Feb 2021 12:06:35 +0100 Subject: fix(translation): replace static error message as suggested by @kesselb in nextcloud/server#25490 Signed-off-by: Samuel --- lib/private/Share20/Manager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 9a2b413896b..cbe79ddaeb9 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -529,7 +529,7 @@ class Manager implements IManager { * Check for pre share requirements for user shares * * @param IShare $share - * @throws \Exception + * @throws GenericShareException */ protected function userCreateChecks(IShare $share) { // Check if we can share with group members only @@ -542,7 +542,8 @@ class Manager implements IManager { $this->groupManager->getUserGroupIds($sharedWith) ); if (empty($groups)) { - throw new \Exception('Sharing is only allowed with group members'); + $message_t = $this->l->t('Sharing is only allowed with group members'); + throw new GenericShareException($message_t, $message_t, 404); } } -- cgit v1.2.3 From 5f8dfa8e4c3c4ed4e9edf38d14719e2fd7570464 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 5 Feb 2021 12:52:59 +0100 Subject: revert(exception): keep throwing an exception for now Signed-off-by: Samuel --- lib/private/Share20/Manager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index cbe79ddaeb9..e1e3e45064e 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -529,7 +529,7 @@ class Manager implements IManager { * Check for pre share requirements for user shares * * @param IShare $share - * @throws GenericShareException + * @throws \Exception */ protected function userCreateChecks(IShare $share) { // Check if we can share with group members only @@ -543,7 +543,8 @@ class Manager implements IManager { ); if (empty($groups)) { $message_t = $this->l->t('Sharing is only allowed with group members'); - throw new GenericShareException($message_t, $message_t, 404); + // throw new GenericShareException($message_t, $message_t, 404); + throw new \Exception($message_t); } } -- cgit v1.2.3 From 3a077a3903dddcf6de7a70dc5227460065b3caa1 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 5 Feb 2021 13:27:37 +0100 Subject: revert(comment) Signed-off-by: Samuel --- lib/private/Share20/Manager.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index e1e3e45064e..32bc0363b99 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -543,7 +543,6 @@ class Manager implements IManager { ); if (empty($groups)) { $message_t = $this->l->t('Sharing is only allowed with group members'); - // throw new GenericShareException($message_t, $message_t, 404); throw new \Exception($message_t); } } -- cgit v1.2.3