Changeset 21a0d91 in github

Timestamp:

Apr 11, 2012 6:31:57 AM (13 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

1ba07f0

Parents:

097dbc6

Message:

• Fix contact information update in case when contact photo exists (#1488420)

File:

• program/include/rcube_ldap.php (modified) (3 diffs)

program/include/rcube_ldap.php

@@ -1110 +1110 @@
         $old_data  = $record['_raw_attrib'];
 
+        // special handling of photo col
+        if ($photo_fld = $this->fieldmap['photo']) {
+            // undefined means keep old photo
+            if (!array_key_exists('photo', $save_cols)) {
+                $ldap_data[$photo_fld] = $record['photo'];
+            }
+        }
+
         foreach ($this->fieldmap as $col => $fld) {
             if ($fld) {
@@ -1121 +1129 @@
                 if (is_array($old) && count($old) == 1 && !is_array($val)) {
                     $old = array_pop($old);
+                }
+                if (is_array($val) && count($val) == 1 && !is_array($old)) {
+                    $val = array_pop($val);
                 }
                 // Subentries must be handled separately
@@ -1137 +1148 @@
                     continue;
                 }
+
                 // The field does exist compare it to the ldap record.
                 if ($old != $val) {