- Fix saving empty values in LDAP contact data (#1485781)

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 04779351d..a8ed556d7 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index b13e88395..3bb747b0d 100644
--- a/program/include/rcube_ldap.php
+++ b/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.