summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorChristian Aigner <christian.aigner@huemer-it.com>2019-03-15 10:18:27 +0100
committerChristian Aigner <christian.aigner@huemer-it.com>2019-03-15 10:18:27 +0100
commitcde8a2896dedc007b8dd215b30ec4719a7706f7a (patch)
tree319c5c50c8a4b10193b51ed85302e7e803abdca0 /lib/private
parent9ebf78a88d4f456d13f1ba46437339c01329bd16 (diff)
downloadnextcloud-server-cde8a2896dedc007b8dd215b30ec4719a7706f7a.tar.gz
nextcloud-server-cde8a2896dedc007b8dd215b30ec4719a7706f7a.zip
groupname like username - allow share with both
Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Share20/Manager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 884ab4754f5..9229d6d5f05 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');
}
}