From 7ed701b4714f99d7cdb953eef02d206f691264b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Tue, 4 Jan 2011 00:14:13 +0100 Subject: [PATCH] [ldap] Use cn when displayName is empty When the optional 'displayName' attribute is empty, use 'cn', which is mandatory and never empty. This prevents empty names being displayed. --- 3.0/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3.0/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php b/3.0/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php index d4e096ff..64b11573 100644 --- a/3.0/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php +++ b/3.0/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php @@ -232,7 +232,10 @@ class Ldap_User implements User_Definition { } public function display_name() { - return $this->ldap_entry["displayname"][0]; + if (!empty($this->ldap_entry["displayname"][0])) { + return $this->ldap_entry["displayname"][0]; + } + return $this->ldap_entry["cn"][0]; } public function __get($key) {