diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-06-14 10:59:12 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-06-14 10:59:12 +0200 |
| commit | 207d618c22f6e50cf1dff983791282afe9f267ce (patch) | |
| tree | 09d127b4f82c90a33bc24043d389eeb143432f6f /program/include/rcube_ldap.php | |
| parent | e10faba00057d03e28b48720f76ca4e469ef1c71 (diff) | |
| parent | 90a713e8823cf8fefb25280f9d155f69b2227303 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include/rcube_ldap.php')
| -rw-r--r-- | program/include/rcube_ldap.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index f799df2bb..8f23a406b 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -1191,8 +1191,11 @@ class rcube_ldap extends rcube_addressbook else if ($val == '') { // Field supplied is empty, verify that it is not required. if (!in_array($fld, $this->prop['required_fields'])) { - // It is not, safe to clear. - $deletedata[$fld] = $old_data[$fld]; + // ...It is not, safe to clear. + // #1488420: Workaround "ldap_mod_del(): Modify: Inappropriate matching in..." + // jpegPhoto attribute require an array() here. It looks to me that it works for other attribs too + $deletedata[$fld] = array(); + //$deletedata[$fld] = $old_data[$fld]; } } else { |