Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.1.2.7.2.7
diff -u -r1.1.2.7.2.7 feedapi_mapper.module
--- feedapi_mapper.module	27 Oct 2008 00:07:34 -0000	1.1.2.7.2.7
+++ feedapi_mapper.module	7 Dec 2008 13:31:36 -0000
@@ -75,7 +75,7 @@
         $element_path = unserialize($element_path);
         // Get the feed item element on $element_path and pass it into the mapping function.
         $feed_item_element = _feedapi_mapper_get_feed_item_element($element_path, $feed_item);
-        $node = call_user_func($field[0] .'_feedapi_mapper', 'map', $node, $field[1], $feed_item_element, isset($field[2]) ? $field[2] : NULL);
+        $node = call_user_func($field[0] .'_feedapi_mapper', 'map', $node, $field[1], $feed_item_element, (isset($field[2]) ? $field[2] : NULL), $feed_item);
       }
     }
   }
@@ -439,6 +439,7 @@
  * Argument 1 always has to be an array.
  */
 function _feedapi_mapper_array_merge_recursive($array1, $array2) {
+  $result = array();
   foreach ($array1 as $k => $v) {
     if (is_array($array1[$k])) {
       $result[$k] = _feedapi_mapper_array_merge_recursive($array1[$k], isset($array2[$k]) ? $array2[$k] : NULL);