diff options
author | Christian Aigner <christian.aigner@huemer-it.com> | 2019-03-15 10:18:27 +0100 |
---|---|---|
committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-03-20 15:33:34 +0000 |
commit | 03ee137804b53d5182538dadb8d3501ae8c81031 (patch) | |
tree | 0e0005c38438194c22966940a61c10cf8efad494 /lib | |
parent | 1c8779dc6e34a89ea9181b3cb252101e457c1543 (diff) | |
download | nextcloud-server-03ee137804b53d5182538dadb8d3501ae8c81031.tar.gz nextcloud-server-03ee137804b53d5182538dadb8d3501ae8c81031.zip |
groupname like username - allow share with both
Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
Diffstat (limited to 'lib')
-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 38be97746f4..a15b2276ae6 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -438,7 +438,7 @@ class Manager implements IManager { } // Identical share already existst - if ($existingShare->getSharedWith() === $share->getSharedWith()) { + if ($existingShare->getSharedWith() === $share->getSharedWith() && ($existingShare->getShareType() === $share->getShareType())) { throw new \Exception('Path is already shared with this user'); } @@ -493,7 +493,7 @@ class Manager implements IManager { //It is a new share so just continue } - if ($existingShare->getSharedWith() === $share->getSharedWith()) { + if ($existingShare->getSharedWith() === $share->getSharedWith() && ($existingShare->getShareType() === $share->getShareType())) { throw new \Exception('Path is already shared with this group'); } } |