diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-20 16:32:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 16:32:53 +0100 |
| commit | 8781a77d37426c5d1668e13d2cadf032e6ba413c (patch) | |
| tree | 744008544f286393b3b5c82e9a49888e8a5ef9ad | |
| parent | d211d5ef57f411a12582c52f521872f6e6550890 (diff) | |
| parent | 38beea864209e4a9515ba5a1012f0f7a9d8a12c5 (diff) | |
| download | nextcloud-server-8781a77d37426c5d1668e13d2cadf032e6ba413c.tar.gz nextcloud-server-8781a77d37426c5d1668e13d2cadf032e6ba413c.zip | |
Merge pull request #14709 from HuemerGroup/groupname_like_username-allow_share_with_both
groupname like username - allow share with both
| -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 276a57ef609..73fc04c7cc9 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'); } } |