Fix array inputs for addresses

horde · Nov 3, 2014 · c2bf3b3 · c2bf3b3
1 parent 690cab3
commit c2bf3b3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
@@ -377,15 +377,15 @@ public function getAddrFields()
                 'map' => false
             );
 
-            if (strlen($data)) {
-                if (strlen($data_ac)) {
-                    $tmp['map'] = true;
-                    foreach (json_decode($data_ac, true) as $val2) {
-                        $tmp['addr'][$val2[1]] = $val2[0];
-                    }
-                } else {
-                    $tmp['addr'][] = $data;
+            if (strlen($data_ac)) {
+                $tmp['map'] = true;
+                foreach (json_decode($data_ac, true) as $val2) {
+                    $tmp['addr'][$val2[1]] = $val2[0];
                 }
+            } else {
+                $tmp['addr'] += is_array($data)
+                    ? array_values($data)
+                    : array($data);
             }
 
             $out[$val] = $tmp;