- Make sure LDAP name fields aren't arrays (#1488108)

alecpl

2011-10-07 b1f0846727331f58342e9cfdd02df03ea8f15181

 program/include/rcube_ldap.php

@@ -72,7 +72,7 @@
    function __construct($p, $debug=false, $mail_domain=NULL)
    {
        $this->prop = $p;
        

        if (isset($p['searchonly']))
            $this->searchonly = $p['searchonly'];

@@ -447,7 +447,7 @@
            $this->result->searchonly = true;
            return $this->result;
        }
        

        // add general filter to query
        if (!empty($this->prop['filter']) && empty($this->filter))
        {
@@ -1031,6 +1031,11 @@
                else
                    $out[$rf] = $value;
            }

            // Make sure name fields aren't arrays (#1488108)
            if (is_array($out[$rf]) && in_array($rf, array('name', 'surname', 'firstname', 'middlename', 'nickname'))) {
                $out[$rf] = $out[$rf][0];
            }
        }

        return $out;