Handle nicely situation when normalize_entry is executed on already normalized entry

pull/132/head
Aleksander Machniak 11 years ago
parent 955a613cac
commit a4bc6ea24d

@ -696,11 +696,17 @@ class rcube_ldap_generic
* Turn an LDAP entry into a regular PHP array with attributes as keys. * Turn an LDAP entry into a regular PHP array with attributes as keys.
* *
* @param array $entry Attributes array as retrieved from ldap_get_attributes() or ldap_get_entries() * @param array $entry Attributes array as retrieved from ldap_get_attributes() or ldap_get_entries()
*
* @return array Hash array with attributes as keys * @return array Hash array with attributes as keys
*/ */
public static function normalize_entry($entry) public static function normalize_entry($entry)
{ {
if (!isset($entry['count'])) {
return $entry;
}
$rec = array(); $rec = array();
for ($i=0; $i < $entry['count']; $i++) { for ($i=0; $i < $entry['count']; $i++) {
$attr = $entry[$i]; $attr = $entry[$i];
if ($entry[$attr]['count'] == 1) { if ($entry[$attr]['count'] == 1) {

Loading…
Cancel
Save