Permalink
Browse files

Fix LDAP Numeric id

  • Loading branch information...
1 parent 1078fae commit 22cee16631c3363d3d1ac4771b45442304c2754c @c12simple c12simple committed Sep 23, 2016
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/src/plugins/auth.multi/MultiAuthDriver.php
@@ -304,7 +304,7 @@ public function listUsers($baseGroup = "/", $recursive = true)
$this->addToCache(array_keys($masterUsers), $this->slaveName);
$slaveUsers = $this->drivers[$this->masterName]->listUsers($baseGroup, $recursive);
$this->addToCache(array_keys($slaveUsers), $this->masterName);
- return array_merge($masterUsers, $slaveUsers);
+ return $masterUsers + $slaveUsers;
}
if ($this->getCurrentDriver()) {
// return $this->getCurrentDriver()->listUsers($baseGroup);

0 comments on commit 22cee16

Please sign in to comment.