Fix duplicated fields when object is converted into array

1 files changed, 7 insertions, 2 deletions

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);