From 0ed7034d353cf0f2a3348a74c8562fdbbd1cff67 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 3 Aug 2012 11:28:28 +0200 Subject: Fix duplicated fields when object is converted into array --- program/steps/addressbook/func.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'program/steps/addressbook/func.inc') diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 8abf061b8..a80240b65 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -580,8 +580,13 @@ function rcmail_contact_form($form, $record, $attrib = null) if (empty($values) && $colprop['visible']) $values[] = ''; + if (!is_array($values)) { + // $values can be an object, don't use (array)$values syntax + $values = !empty($values) ? array($values) : array(); + } + $rows = ''; - foreach ((array)$values as $i => $val) { + foreach ($values as $i => $val) { if ($subtypes[$i]) $subtype = $subtypes[$i]; @@ -638,7 +643,7 @@ function rcmail_contact_form($form, $record, $attrib = null) $val = $colprop['options'][$val]; else $val = Q($val); - +console($val); // use subtype as label if ($colprop['subtypes']) $label = rcmail_get_type_label($subtype); -- cgit v1.2.3