Skip to content

[stable15] Fix count on string #12683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Nov 27, 2018
Merged

[stable15] Fix count on string #12683

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943f257
Fix count on string
kesselb Nov 24, 2018
d0f341b
Add return type
kesselb Nov 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix count on string 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb authored and Backportbot committed Nov 27, 2018
commit 943f2576c578d556ee6e5fa77bfef16ab8efb515
17 changes: 15 additions & 2 deletions apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null,
});
}
$this->batchApplyUserAttributes($recordsToUpdate);
return $this->fetchList($ldapRecords, count($attr) > 1);
return $this->fetchList($ldapRecords, $this->manyAttributes($attr));
}

/**
Expand Down Expand Up @@ -922,7 +922,7 @@ public function batchApplyUserAttributes(array $ldapRecords){
* @return array
*/
public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) {
return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), count($attr) > 1);
return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), $this->manyAttributes($attr));
}

/**
Expand Down Expand Up @@ -2011,4 +2011,17 @@ private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
return $pagedSearchOK;
}

/**
* Is more than one $attr used for search?
*
* @param string|string[]|null $attr
* @return bool
*/
private function manyAttributes($attr) {
if (\is_array($attr)) {
return \count($attr) > 1;
}
return false;
}

}