[Svn] r2890 - in trunk/roundcubemail: . program/include

trac at roundcube.net trac at roundcube.net
Sat Aug 29 20:48:54 CEST 2009


Author: alec
Date: 2009-08-29 13:48:54 -0500 (Sat, 29 Aug 2009)
New Revision: 2890

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_ldap.php
Log:
- Fix saving empty values in LDAP contact data (#1485781)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-08-29 18:41:17 UTC (rev 2889)
+++ trunk/roundcubemail/CHANGELOG	2009-08-29 18:48:54 UTC (rev 2890)
@@ -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)

Modified: trunk/roundcubemail/program/include/rcube_ldap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_ldap.php	2009-08-29 18:41:17 UTC (rev 2889)
+++ trunk/roundcubemail/program/include/rcube_ldap.php	2009-08-29 18:48:54 UTC (rev 2890)
@@ -413,7 +413,7 @@
     $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 @@
     $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.

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list