--- location.module	2007-10-30 21:57:32.000000000 -0400
+++ location_new.module	2007-11-06 18:03:35.000000000 -0500
@@ -606,7 +606,16 @@ function location_form_alter($form_id, &
       '#description' => t('Display the "Add another location" option on the node view page.')
     );
 
-    $form['location']['required_field_notice'] = array(
+     //Teaser settings
+     $form['location']['location_teaser'] = array(
+       '#type' => 'checkbox',
+       '#title' => t('Teaser'),
+       '#return_value' => 1,
+       '#default_value'=> variable_get('location_teaser_'. $type, 1),
+       '#description' => t('Show locations in teasers for this content type')
+     );
+
+	$form['location']['required_field_notice'] = array(
       '#type' => 'markup',
       '#value' => '<p><strong>'. t('NOTE:') .'</strong> '. t('Locations fields you choose to require will only be required for the first location if you have allowed more than one location to be submitted for this node type.') .'</p>'
     );
@@ -1041,6 +1050,9 @@ function location_nodeapi(&$node, $op, $
       return $loaded_data;
       
     case 'view':
+      if ($teaser && variable_get('location_teaser_'. $node->type, 1) == 0) {
+        return ''; 
+      }
       if (variable_get('location_display_location', 1)) {
         if (isset($_POST) && ($_POST['op'] == t('Preview') || ($_POST['op'] == t('Submit') && form_get_errors()))) {
           $posted_locations = array();