mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14766 from nextcloud/backport/14709/master 

groupname like username - allow share with both
This commit is contained in:
Morris Jobke 2019-03-20 19:08:44 +01:00 committed by GitHub
parent 1c8779dc6e ab7858d1a9
commit f8859e91dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Share20/Manager.php
View File

@ -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');
}
}