Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.1.2.7.2.28
diff -u -p -r1.1.2.7.2.28 feedapi_mapper.module
--- feedapi_mapper.module	13 Jul 2009 19:30:21 -0000	1.1.2.7.2.28
+++ feedapi_mapper.module	13 Jul 2009 20:23:37 -0000
@@ -94,11 +94,9 @@ function feedapi_mapper_theme() {
  */
 function theme_feedapi_mapper_descriptions($descriptions) {
   $output = '<dl>';
-  foreach ($descriptions as $field_mapper => $implementations) {
-    foreach ($implementations as $module => $description) {
-      $output .= '<dt><strong>'. $field_mapper .' '. t('(!module_name module)', array('!module_name' => $module)) .'</strong></dt>';
-      $output .= '<dd>'. $description .'</dd>';
-    }
+  foreach ($descriptions as $module => $description) {
+    $output .= '<dt><strong>'. t('(!module_name module)', array('!module_name' => $module)) .'</strong></dt>';
+    $output .= '<dd>'. $description .'</dd>';
   }
   $output .= '</dl>';
   return $output;
@@ -329,14 +327,20 @@ function feedapi_mapper_form($form_state
     '#value' => t('Add'),
   );
   
-  // Print descriptions if there are any.
+  // Print descriptions for available mapping targets.
+  // This is done by iterating through $field_map and extracting module names from it.
   $descriptions = _feedapi_mapper_get_field_mappers_descriptions($feed_item_type);
   $descriptions_filtered = array();
   foreach ($field_map as $key => $target) {
-    @$key = unserialize($key);
+    if (is_array($target)) {
+      $key = unserialize(key($target));
+    }
+    else {
+      $key = unserialize($key);
+    }
     if (is_array($key)) {
       $module = $key[0];
-      $descriptions_filtered[''][$module] = $descriptions[''][$module];
+      $descriptions_filtered[$module] = $descriptions[$module];
     }
   }
 
@@ -744,7 +748,7 @@ function _feedapi_mapper_get_field_mappe
   $descriptions = array();
   foreach ($modules as $module) {
     if ($description = module_invoke($module, 'feedapi_mapper', 'describe', $node)) {
-      $descriptions[$field_name][$module] = $description;
+      $descriptions[$module] = $description;
     }
   }
   return $descriptions;