diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-28 11:06:36 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-28 11:06:36 -0400 |
| commit | 7ff04be091ce7c75a749feba1ab184869c915e63 (patch) | |
| tree | 4dec006a26603d4eac007e8b32db389daed606f2 /apps/files_sharing | |
| parent | e02d8d7f7e3c1958e28ddaf9b388fc062ff35a8c (diff) | |
| download | nextcloud-server-7ff04be091ce7c75a749feba1ab184869c915e63.tar.gz nextcloud-server-7ff04be091ce7c75a749feba1ab184869c915e63.zip | |
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib_share.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php index 3bedd9bebc8..1c061cde07a 100644 --- a/apps/files_sharing/lib_share.php +++ b/apps/files_sharing/lib_share.php @@ -179,10 +179,13 @@ class OC_Share { $uid_shared_with = OC_Group::usersInGroup($uid_shared_with); // Remove the owner from the list of users in the group $uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser())); - } else if ($uid = strrchr($uid_shared_with, '@', true)) { - $uid_shared_with = array($uid); } else { - $uid_shared_with = array($uid_shared_with); + $pos = strrpos($uid_shared_with, '@'); + if ($pos !== false && OC_Group::groupExists(substr($uid_shared_with, $pos + 1))) { + $uid_shared_with = array(substr($uid_shared_with, 0, $pos)); + } else { + $uid_shared_with = array($uid_shared_with); + } } foreach ($uid_shared_with as $uid) { $sharedFolder = $uid.'/files/Shared'; |