From 65c3bb0bab5b2fc39617e90b3be22f81e63e929f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 13 Jun 2012 09:07:46 -0400
Subject: [PATCH] Fix handling of unitless CSS size values in HTML message (#1488535)
---
program/include/rcube_ldap.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index c14fd0e..9904d7d 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -132,7 +132,7 @@
if ($this->fieldmap['street'] && $this->fieldmap['locality']) {
$this->coltypes['address'] = array(
'limit' => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']),
- 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], $this->coltypes['locality']['subtypes']),
+ 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], (array)$this->coltypes['locality']['subtypes']),
'childs' => array(),
) + (array)$this->coltypes['address'];
@@ -1194,8 +1194,11 @@
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 {
--
Gitblit v1.9.1