From 031e54b9a35febe1df4b8a049f0a3e664f54f5d0 Mon Sep 17 00:00:00 2001
From: James Gollan <james@swamphen.com>
Date: Sun, 1 Jan 2012 19:05:23 +1100
Subject: [PATCH] Allow media formatters to be applied to file fields.

---
 includes/media.fields.inc       |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 file_formatters-1390878-1.patch

diff --git a/file_formatters-1390878-1.patch b/file_formatters-1390878-1.patch
new file mode 100644
index 0000000..e69de29
diff --git a/includes/media.fields.inc b/includes/media.fields.inc
index 5bcf637..cfecda1 100644
--- a/includes/media.fields.inc
+++ b/includes/media.fields.inc
@@ -90,7 +90,7 @@ function media_field_formatter_info() {
     // @todo Some day, remove this.
     'media' => array(
       'label' => t('Media'),
-      'field types' => array('media'),
+      'field types' => array('media', 'file'),
       'settings' => array('file_view_mode' => 'default'),
     ),
   );
@@ -188,10 +188,12 @@ function media_field_formatter_view($entity_type, $entity, $field, $instance, $l
   // Legacy support for the extra formatter added to file fields. See
   // media_field_formatter_info().
   if ($display['type'] == 'media') {
+    $fids = array();
     $files = array();
     foreach ($items as $delta => $item) {
-      $files[$item['fid']] = $item['file'];
+      $fids[$item['fid']] = $item['fid'];
     }
+   $files = file_load_multiple($fids);
     $element = file_view_multiple($files, $display['settings']['file_view_mode'], 0, $langcode);
   }
 
-- 
1.7.4.4