diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-29 18:48:54 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-29 18:48:54 +0000 |
| commit | bb426cee9ae506dc6a4c9abbcd449a1e9cbf5242 (patch) | |
| tree | 7dcb115f13b0d2e8daf1e3add8b9587cfdc1b0f2 /roundcubemail | |
| parent | e6acc84d685860d9e2345af3a07cda2074d92fe8 (diff) | |
- Fix saving empty values in LDAP contact data (#1485781)
git-svn-id: https://svn.roundcube.net/trunk@2890 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_ldap.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 04779351d..a8ed556d7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix saving empty values in LDAP contact data (#1485781) - Fix LDAP contact update when RDN field is changed (#1485788) - Fix LDAP attributes case senitivity problems (#1485830) - Fix LDAP addressbook browsing when only one directory is used (#1486022) diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php index b13e88395..3bb747b0d 100644 --- a/roundcubemail/program/include/rcube_ldap.php +++ b/roundcubemail/program/include/rcube_ldap.php @@ -413,7 +413,7 @@ class rcube_ldap extends rcube_addressbook $newentry['objectClass'] = $this->prop['LDAP_Object_Classes']; foreach ($save_cols as $col => $val) { $fld = $this->_map_field($col); - if ($fld != '') { + if ($fld && $val) { // The field does exist, add it to the entry. $newentry[$fld] = $val; } // end if @@ -457,7 +457,7 @@ class rcube_ldap extends rcube_addressbook $deletedata = array(); foreach ($save_cols as $col => $val) { $fld = $this->_map_field($col); - if ($fld != '') { + if ($fld) { // The field does exist compare it to the ldap record. if ($record[$col] != $val) { // Changed, but find out how. |