Merge pull request #14709 from HuemerGroup/groupname_like_username-allow_share_with_both

groupname like username - allow share with both

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