diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-29 11:53:52 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-29 11:53:52 +0000 |
| commit | 558b2469c6bf6fee347a7f23b60fc501b39cd50a (patch) | |
| tree | b9a6c6ff74a1813c573a6db5d166b5c7917dd6eb | |
| parent | b40e64ddcbbda46fc64a8c04a3c630572aa36dc9 (diff) | |
- Fix warning when properties array is empty
git-svn-id: https://svn.roundcube.net/trunk@5930 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/rcube_ldap.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php index 5eab7dba0..d22dc6aab 100644 --- a/roundcubemail/program/include/rcube_ldap.php +++ b/roundcubemail/program/include/rcube_ldap.php @@ -63,7 +63,7 @@ class rcube_ldap extends rcube_addressbook /** * Object constructor * - * @param array LDAP connection properties + * @param array LDAP connection properties * @param boolean Enables debug mode * @param string Current user mail domain name * @param integer User-ID @@ -95,7 +95,7 @@ class rcube_ldap extends rcube_addressbook foreach ($p['fieldmap'] as $rf => $lf) $this->fieldmap[$rf] = $this->_attr_name(strtolower($lf)); } - else { + else if (!empty($p)) { // read deprecated *_field properties to remain backwards compatible foreach ($p as $prop => $value) if (preg_match('/^(.+)_field$/', $prop, $matches)) |