? media-drupal_render-fix-1016232-5.patch
Index: media.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.admin.inc,v
retrieving revision 1.24
diff -u -p -r1.24 media.admin.inc
--- media.admin.inc	19 Nov 2010 15:09:46 -0000	1.24
+++ media.admin.inc	7 Jan 2011 18:39:32 -0000
@@ -175,10 +175,11 @@ function media_admin_thumbnails() {
 
   if (count($media_entities)) {
     foreach ($media_entities as $media) {
+     $preview = media_get_thumbnail_preview($media, TRUE);
      $form['files'][$media->fid] = array(
        '#type' => 'checkbox',
        '#title' => '',
-       '#prefix' => '<li>' . drupal_render(media_get_thumbnail_preview($media, TRUE)),
+       '#prefix' => '<li>' . drupal_render($preview),
        '#suffix' => '</li>',
      );
     }
Index: media.browser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.browser.inc,v
retrieving revision 1.27
diff -u -p -r1.27 media.browser.inc
--- media.browser.inc	29 Nov 2010 20:03:11 -0000	1.27
+++ media.browser.inc	7 Jan 2011 18:39:32 -0000
@@ -410,6 +410,7 @@ EOF;
  * @param Object &$media;
  */
 function media_browser_build_media_item(&$media) {
-  $media->preview = drupal_render(media_get_thumbnail_preview($media));
+  $preview = media_get_thumbnail_preview($media);
+  $media->preview = drupal_render($preview);
   $media->url = file_create_url($media->uri);
 }
Index: media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.module,v
retrieving revision 1.63
diff -u -p -r1.63 media.module
--- media.module	5 Jan 2011 22:07:07 -0000	1.63
+++ media.module	7 Jan 2011 18:39:33 -0000
@@ -952,9 +952,14 @@ function media_element_process(&$element
   );
 
   //@TODO: This should be loaded from the JS in case of a failed form submission.
+  $markup = '';
+  if (!empty($media)) {
+    $preview = media_get_thumbnail_preview($media);
+    $markup = drupal_render($preview);
+  }
   $element['preview'] = array(
     '#type' => 'item',
-    '#markup' => empty($media) ? '' : drupal_render(media_get_thumbnail_preview($media)),
+    '#markup' => $markup,
     '#prefix' => '<div class="preview launcher">',
     '#suffix' => '</div><a class="launcher" href="#">' . t(media_variable_get('field_select_media_text')) . '</a>',
   );
Index: media.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.theme.inc,v
retrieving revision 1.14
diff -u -p -r1.14 media.theme.inc
--- media.theme.inc	26 Oct 2010 22:45:53 -0000	1.14
+++ media.theme.inc	7 Jan 2011 18:39:33 -0000
@@ -88,7 +88,8 @@ function theme_media_browser_content_fra
    // Render the results limiter
   $html[] = theme('media_browser_control_result_limit', array('parameters' => $parameters));
   // Render the actual content
-  $html[] = drupal_render(drupal_get_form('media_file_listing_form', $files, $parameters));
+  $form = drupal_get_form('media_file_listing_form', $files, $parameters);
+  $html[] = drupal_render($form);
 
   // Make sure to close the wrapping div
   if ($invoke) {