Index: contrib/location_cck/location_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/contrib/location_cck/location_cck.module,v
retrieving revision 1.5.2.4
diff -u -u -p -r1.5.2.4 location_cck.module
--- contrib/location_cck/location_cck.module	6 Jan 2009 18:47:31 -0000	1.5.2.4
+++ contrib/location_cck/location_cck.module	8 Jan 2009 19:30:36 -0000
@@ -350,6 +350,11 @@ function location_cck_content_is_empty($
 }
 
 function theme_location_cck_formatter_default($element) {
+  // Load field instance info. This contains information about which fields' output to hide.
+  module_load_include('inc', 'content', 'includes/content.crud');
+  $field = content_field_instance_read(array('type_name' => $element['#type_name'], 'field_name' => $element['#field_name']));
+  $hide = $field[0]['location_settings']['display']['hide'];
+
   $location = $element['#item'];
   if (!empty($location['cck_preview_in_progress'])) {
     // Our canary field is in place, we are in a node preview.
@@ -357,12 +362,12 @@ function theme_location_cck_formatter_de
     // If the delete location checkbox isn't checked, and the location isn't
     // "empty", then theme it based on the current state of the item.
     if (!location_is_empty($location, $fields) && empty($location['delete_location'])) {
-      return theme('location', $location);
+      return theme('location', $location, $hide);
     }
   }
   else if (isset($location['lid']) && $location['lid']) {
     // "normal" viewing.
     $location = location_load_location($location['lid']);
-    return theme('location', $location);
+    return theme('location', $location, $hide);
   }
 }