Index: location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.module,v
retrieving revision 1.62
diff -u -F^f -r1.62 location.module
--- location.module	19 Apr 2006 00:08:32 -0000	1.62
+++ location.module	8 May 2006 09:14:34 -0000
@@ -430,12 +430,12 @@ function location_form_alter($form_id, &
     }
 
     $suppressed_values = variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array();
-
+    if (!isset($form['location'])) $form['location']=array();
     if ($_POST['op'] == t('Preview') || ($_POST['op'] == t('Submit') && form_get_errors())) {
-      $form['location'] = location_form($location_fields, $node->location ? $node->location : array(), $required_fields, $suppressed_values);
+      $form['location'] = array_merge($form['location'],location_form($location_fields, $node->location ? $node->location : array(), $required_fields, $suppressed_values));
     }
     else {
-      $form['location'] = location_form($location_fields, $node->location ? location_api2form($node->location) : array(), $required_fields, $suppressed_values);
+      $form['location'] = array_merge($form['location'],location_form($location_fields, $node->location ? location_api2form($node->location) : array(), $required_fields, $suppressed_values));
     }
     $form['location']['#type'] = 'fieldset';
     $form['location']['#title'] = t('Location');