From ea823416621cc81663cb5bdd0b497ac33a590090 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 27 Nov 2008 21:24:37 +0000
Subject: [PATCH] Fix for flash uploader not displaying progress or completed
 uploads, props abackstrom, fixes #8372

git-svn-id: http://svn.automattic.com/wordpress/trunk@9931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/media.css      |  2 +-
 wp-admin/includes/media.php | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index 18c906b2c7..c3bd6700fe 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -375,7 +375,7 @@ abbr.required {
 	color: #5A5A5A;
 }
 
-.media-blank h3 {
+h3.media-title  {
 	color: #5A5A5A;
 	font-family: Georgia,"Times New Roman",Times,serif;
 	font-size: 1.6em;
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 69287de481..36b8a4eeb1 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1329,9 +1329,7 @@ function media_upload_type_form($type = 'file', $errors = null, $id = null) {
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 
-<div class="media-blank">
-<h3><?php _e('Add media files from your computer'); ?></h3>
-</div>
+<h3 class="media-title"><?php _e('Add media files from your computer'); ?></h3>
 
 <?php media_upload_form( $errors ); ?>
 
@@ -1346,17 +1344,21 @@ jQuery(function($){
 });
 -->
 </script>
-<?php if ( $id && !is_wp_error($id) ) { ?>
 <div id="media-items">
-<?php echo get_media_items( $id, $errors ); ?>
-</div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<?php
-	} elseif ( is_wp_error($id) ) {
+<?php 
+if ( $id ) {
+	if ( !is_wp_error($id) ) {
+		echo get_media_items( $id, $errors );
+	} else {
 		echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
 		exit;
 	}
 }
+?>
+</div>
+<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+<?php
+}
 
 /**
  * {@internal Missing Short Description}}
@@ -1384,9 +1386,7 @@ function media_upload_type_url_form($type = 'file', $errors = null, $id = null)
 
 <?php if ( is_callable($callback) ) { ?>
 
-<div class="media-blank">
-<h3><?php _e('Add media file from URL'); ?></h3>
-</div>
+<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
 
 <script type="text/javascript">
 //<![CDATA[