summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2020-06-19 20:01:06 +0200
committerGitHub <noreply@github.com>2020-06-19 20:01:06 +0200
commit976dbf62412d9e85f57533672b80793b585f0011 (patch)
tree32b2667a1bd032448741694282b82e8ea4588db5 /apps
parent2147c39cb0ea1aeaa7859d46b5a8a6cc9d8ce659 (diff)
parent0ab6ee40de6107c9f660305ee49d5b11044d5266 (diff)
downloadnextcloud-server-976dbf62412d9e85f57533672b80793b585f0011.tar.gz
nextcloud-server-976dbf62412d9e85f57533672b80793b585f0011.zip
Merge pull request #21421 from nextcloud/fix/noid/cached-missing-dn
getXbyY can still return false, e.g. when using ldap write support
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/Mapping/AbstractMapping.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index 6fd07f5f483..0daa4f1504c 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -123,8 +123,7 @@ abstract class AbstractMapping {
*/
public function getDNByName($name) {
$dn = array_search($name, $this->cache);
- if ($dn === false) {
- $dn = $this->getXbyY('ldap_dn', 'owncloud_name', $name);
+ if ($dn === false && ($dn = $this->getXbyY('ldap_dn', 'owncloud_name', $name)) !== false) {
$this->cache[$dn] = $name;
}
return $dn;