Changeset 5540 in subversion

Timestamp:

Dec 4, 2011 11:57:40 AM (19 months ago)

Author:

thomasb

Message:

Fix saving of composite address fields without subtype

File:

• trunk/roundcubemail/program/steps/addressbook/save.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/addressbook/save.inc

@@ -51 +51 @@
         $values[$i][$childcol] = $val;
     }
-    $subtypes = get_input_value('_subtype_' . $col, RCUBE_INPUT_POST);
-    foreach ($subtypes as $i => $subtype)
+    $subtypes = isset($_REQUEST['_subtype_' . $col]) ? (array)get_input_value('_subtype_' . $col, RCUBE_INPUT_POST) : array('');
+    foreach ($subtypes as $i => $subtype) {
+      $suffix = $subtype ? ':'.$subtype : '';
       if ($values[$i])
-        $a_record[$col.':'.$subtype][] = $values[$i];
+        $a_record[$col.$suffix][] = $values[$i];
+     }
   }
   // assign values and subtypes