diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-20 19:08:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 19:08:44 +0100 |
| commit | f8859e91dd1c6dde01db4037b43e62447845eb7a (patch) | |
| tree | 46f3a73b3fcaff8d8295b4d6c5a7c2ec00e3efac /lib | |
| parent | 1c8779dc6e34a89ea9181b3cb252101e457c1543 (diff) | |
| parent | ab7858d1a9d8860cfdb9b47aa843840fa02689ba (diff) | |
| download | nextcloud-server-f8859e91dd1c6dde01db4037b43e62447845eb7a.tar.gz nextcloud-server-f8859e91dd1c6dde01db4037b43e62447845eb7a.zip | |
Merge pull request #14766 from nextcloud/backport/14709/master
groupname like username - allow share with both
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..c2ea165955f 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'); } } |