Merge pull request #24763 from nextcloud/backport/24515/stable20
[stable20] fixes sharing to group ids with characters that are being url encoded
This commit is contained in:
commit
25143fc87b
|
@ -344,9 +344,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
|
||||
$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
|
||||
|
||||
$principals = array_map(function ($principal) {
|
||||
return urldecode($principal);
|
||||
}, $principals);
|
||||
$principals[] = $principalUri;
|
||||
|
||||
$fields = array_values($this->propertyMap);
|
||||
|
|
|
@ -191,9 +191,6 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
|||
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
|
||||
$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
|
||||
|
||||
$principals = array_map(function ($principal) {
|
||||
return urldecode($principal);
|
||||
}, $principals);
|
||||
$principals[] = $principalUri;
|
||||
|
||||
$query = $this->db->getQueryBuilder();
|
||||
|
|
|
@ -219,7 +219,7 @@ class GroupPrincipalBackend implements BackendInterface {
|
|||
}
|
||||
}
|
||||
|
||||
$carry[] = self::PRINCIPAL_PREFIX . '/' . $gid;
|
||||
$carry[] = self::PRINCIPAL_PREFIX . '/' . urlencode($gid);
|
||||
return $carry;
|
||||
}, []);
|
||||
break;
|
||||
|
|
|
@ -107,6 +107,7 @@ class Backend {
|
|||
return;
|
||||
}
|
||||
|
||||
$principal[2] = urldecode($principal[2]);
|
||||
if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
|
||||
($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
|
||||
// User or group does not exist
|
||||
|
|
Loading…
Reference in New Issue