*** mediafront.module.orig	2012-04-16 18:59:27.000000000 -0700
--- mediafront.module	2012-04-16 18:48:29.000000000 -0700
***************
*** 482,488 ****
    if ($items = field_get_items('node', $entity, $field_name)) {
      foreach ($items as $item) {
        if ($value = mediafront_get_node_field_instance_value($item)) {
!         return $value;
        }
      }
    }
--- 482,490 ----
    if ($items = field_get_items('node', $entity, $field_name)) {
+     $values = array();
      foreach ($items as $item) {
        if ($value = mediafront_get_node_field_instance_value($item)) {
!         $values[] = $value;
        }
      }
+     return $values;
    }
***************
*** 526,529 ****
  
!     // Get the value for this field.
      if ($value = mediafront_get_field_value($type, $entity, $field)) {
  
--- 528,532 ----
  
!     // Get the value(s) for this field.
      if ($value = mediafront_get_field_value($type, $entity, $field)) {
+       $value = is_array($value) ? $value : array($value);
  
***************
*** 531,533 ****
        if ($field['type'] == 'media') {
!         $node['mediafiles']['media'][$options['media_type']] = new MediaFile($value);
        }
--- 534,538 ----
        if ($field['type'] == 'media') {
!         foreach ($value as $entry) {
!           $node['mediafiles']['media'][$options['media_type']][] = new MediaFile($entry);
!         }
        }
***************
*** 538,541 ****
          // If we just want the original image...
!         if (($options['preview'] == 'mediafront_original') || ($options['thumbnail'] == 'medifaront_original')) {
!           $file = new MediaFile($value);
            $node['mediafiles']['image']['image'] = $file;
--- 543,546 ----
          // If we just want the original image...
!         if (($options['preview'] == 'mediafront_original') || ($options['thumbnail'] == 'mediafront_original')) {
!           $file = new MediaFile($value[0]);
            $node['mediafiles']['image']['image'] = $file;
***************
*** 545,549 ****
          if (!empty($options['preview'])) {
!           $file = new MediaFile($value);
            $file->path = image_style_url($options['preview'], $file->file->uri);
!           $node["mediafiles"]['image']['preview'] = $file;
          }
--- 550,554 ----
          if (!empty($options['preview'])) {
!           $file = new MediaFile($value[0]);
            $file->path = image_style_url($options['preview'], $file->file->uri);
!           $node['mediafiles']['image']['preview'] = $file;
          }
***************
*** 552,556 ****
          if (!empty($options['thumbnail'])) {
!           $file = new MediaFile($value);
            $file->path = image_style_url($options['thumbnail'], $file->file->uri);
!           $node["mediafiles"]['image']['thumbnail'] = $file;
          }
--- 557,561 ----
          if (!empty($options['thumbnail'])) {
!           $file = new MediaFile($value[0]);
            $file->path = image_style_url($options['thumbnail'], $file->file->uri);
!           $node['mediafiles']['image']['thumbnail'] = $file;
          }
***************
*** 560,562 ****
        else if ($field['type'] == 'title') {
!         $node['title'] = $value;
        }
--- 565,567 ----
        else if ($field['type'] == 'title') {
!         $node['title'] = $value[0];
        }
***************
*** 567,569 ****
          // Add this field to the node values.
!         $node[$options['custom']] = $value;
        }
--- 572,574 ----
          // Add this field to the node values.
!         $node[$options['custom']] = $value[0];
        }
***************
*** 572,574 ****
          // All other fields are added directly to the node.
!         $node[$field['field']] = $value;
        }
--- 577,579 ----
          // All other fields are added directly to the node.
!         $node[$field['field']] = $value[0];
        }
***************
*** 584,586 ****
    if (!empty($node['mediafiles']['media']) && empty($node['mediafiles']['image'])) {
!     if ($image = mediafront_get_media_preview($node['mediafiles']['media']['media'])) {
        $node['mediafiles']['image']['image'] = $image;
--- 589,591 ----
    if (!empty($node['mediafiles']['media']) && empty($node['mediafiles']['image'])) {
!     if ($image = mediafront_get_media_preview($node['mediafiles']['media']['media'][0])) {
        $node['mediafiles']['image']['image'] = $image;