summaryrefslogtreecommitdiff
path: root/program/include/rcube_ldap.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-13 12:12:53 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-13 12:14:03 +0200
commit7456c27b47937d05fee84881e50dec66853975fa (patch)
tree69f1ef6d2c53b263bedd3381b33ce089b3217cf6 /program/include/rcube_ldap.php
parent16114e620d0e6781b1d423200b4947eb05bf6afa (diff)
Fix removing contact photo using LDAP addressbook (#1488420)
Conflicts: CHANGELOG
Diffstat (limited to 'program/include/rcube_ldap.php')
-rw-r--r--program/include/rcube_ldap.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 2c4497733..9904d7d7d 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -1194,8 +1194,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 {