Index: location_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/contrib/location_cck/location_cck.module,v
retrieving revision 1.16
diff -u -r1.16 location_cck.module
--- location_cck.module	3 Apr 2009 19:00:30 -0000	1.16
+++ location_cck.module	15 Apr 2009 04:33:17 -0000
@@ -184,10 +184,20 @@
     case 'load':
       $locations = array();
       // Locations are being cached by CCK now. Load the full location.
-      foreach ($items as $item) {
-        $locations[] = location_load_location($item['lid']);
+      foreach ($items as $key => $item) {
+        $location = location_load_location($item['lid']);
+        $location['field_name'] = $field['field_name'];
+        $location['offset'] = $key;
+        $locations[] = $location;
+      }
+      // Merge each location field into $node->locations for backwards compat.
+      if (isset($node->locations) && is_array($node->locations)) {
+        $node->locations = array_merge($node->locations, $locations);
       }
-      return array($field['field_name'] => $locations);
+      else {
+        $node->locations = $locations;
+      }
+      return array($field['field_name'] => $locations, 'locations' => $node->locations);
 
     case 'delete':
       // Run through the revisions and clean up all applicable references.