summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2020-06-19 20:45:38 +0200
committerGitHub <noreply@github.com>2020-06-19 20:45:38 +0200
commit8f35a66100a38d4d8f7dc52b757d5bfdfd82c0f8 (patch)
tree6468815abf9bcd431b9f8da07ad3a7189b667cfe /apps
parente5b468fb1abbae6b0daa4887fcf44dd182971184 (diff)
parent8e02367453555d300a12fc9f55c9636dd8e28732 (diff)
downloadnextcloud-server-8f35a66100a38d4d8f7dc52b757d5bfdfd82c0f8.tar.gz
nextcloud-server-8f35a66100a38d4d8f7dc52b757d5bfdfd82c0f8.zip
Merge pull request #21491 from nextcloud/backport/21421/stable19
[stable19] 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;