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

Merge pull request #25367 from nextcloud/backport/25361/stable19 

[stable19] fix parameter provided as string not array
This commit is contained in:
Roeland Jago Douma 2021-01-29 08:33:15 +01:00 committed by GitHub
parent af54ab7af6 9fc88bd217
commit aff475b51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/user_ldap/lib/Group_LDAP.php
View File

@ -201,7 +201,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD
$pos = strpos($memberURLs[0], '('); $pos = strpos($memberURLs[0], '(');
if ($pos !== false) { if ($pos !== false) {
$memberUrlFilter = substr($memberURLs[0], $pos); $memberUrlFilter = substr($memberURLs[0], $pos);
$foundMembers = $this->access->searchUsers($memberUrlFilter, 'dn'); $foundMembers = $this->access->searchUsers($memberUrlFilter, ['dn']);
$dynamicMembers = []; $dynamicMembers = [];
foreach ($foundMembers as $value) { foreach ($foundMembers as $value) {
$dynamicMembers[$value['dn'][0]] = 1; $dynamicMembers[$value['dn'][0]] = 1;
@ -1076,6 +1076,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD
if (!$this->enabled) { if (!$this->enabled) {
return []; return [];
} }
$search = $this->access->escapeFilterPart($search, true);
$cacheKey = 'getGroups-' . $search . '-' . $limit . '-' . $offset; $cacheKey = 'getGroups-' . $search . '-' . $limit . '-' . $offset;
//Check cache before driving unnecessary searches //Check cache before driving unnecessary searches