Index: media.filter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.filter.inc,v
retrieving revision 1.13
diff -u -p -r1.13 media.filter.inc
--- media.filter.inc	28 Oct 2010 14:54:23 -0000	1.13
+++ media.filter.inc	6 Dec 2010 09:20:17 -0000
@@ -354,7 +354,7 @@ function media_get_file_without_label($m
   $instance = field_info_instance('media', 'file', $media->type);
   $format = $instance['display'][$view_mode];
   $format['label'] = 'hidden';
-  $format['settings'] = array_merge($format['settings'], $settings);
+  $format['settings'] = array_merge((array) $format['settings'], $settings);
   $media->override = $settings;
   return field_view_field('media', $media, 'file', $format);
 }