summaryrefslogtreecommitdiff
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:12:53 +0200
commitafaccf14287d06eb7bb5e33cf131b14289040865 (patch)
tree1def4ddfc7433f59bcce1ef9155586be40476e94
parent740875e5cd55581f146fd1fbd2c4d4b904775832 (diff)
Fix removing contact photo using LDAP addressbook (#1488420)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_ldap.php7
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3ac39c3ee..12e4dbf96 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix removing contact photo using LDAP addressbook (#1488420)
- Fix storing X-ANNIVERSARY date in vCard format (#1488527)
- Update to Mail_Mime-1.8.5 (#1488521)
- Fix Shift + delete button does not permanently delete messages (#1488243)
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 {