--- location/contrib/location_cck/location_cck.module	Thu Mar 25 09:00:07 2010
+++ location/contrib/location_cck/location_cck.module	Wed Jun 30 09:39:05 2010
@@ -19,6 +19,9 @@
     ),
     'location_cck_formatter_map' => array(
       'arguments' => array('element' => NULL),
+    ),	    
+	'location_cck_formatter_multiple' => array(
+      'arguments' => array('element' => NULL),
     ),
     'location_cck_field_map' => array(
       'arguments' => array('locations' => NULL, 'field' => NULL),
@@ -355,9 +358,20 @@
  * Alternate function to return a map with all
  * multiple values in the same map.
  */
-function theme_location_cck_formatter_combined($element) {
+function theme_location_cck_formatter_multiple($element) {  
   $field = content_fields($element['#field_name'], $element['#type_name']);
-  $locations = $element['#items'];
+  $aItems = array();
+  if(isset($element['#items'])===TRUE){
+	$aItems = $element['#items'];
+  } else {
+	$aKeys = array_keys($element);	
+	foreach($aKeys as $sKey){
+		if(substr($sKey,0,1)!='#' && is_numeric($sKey)===TRUE){
+			$aItems[$sKey] = $element[$sKey]['#item'];
+		}
+	}
+  }
+  $locations = $aItems;
   return theme_location_cck_field_map($locations, $field);
 }