From 3fcae6d702b4ab23481f9c0128d49a6950036fdf Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 21 Nov 2011 20:46:15 +0000
Subject: [PATCH] Output the "After a file has been uploaded..." message by
 using the post-upload-ui action, fixes #18764

git-svn-id: http://svn.automattic.com/wordpress/trunk@19384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e10da6109d..0bf50c1d68 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1378,14 +1378,12 @@ wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
 <?php do_action('post-html-upload-ui'); ?>
 </div>
 
-<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) );
-if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 )
-		echo ' <span class="big-file-warning">' . __('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.') . '</span></p><p>';
-
-echo ' ' . __('After a file has been uploaded, you can add titles and descriptions.');
-?></p>
-
+<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>
 <?php
+if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 ) { ?>
+	<span class="big-file-warning"><?php _e('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.'); ?></span>
+<?php }
+
 	do_action('post-upload-ui');
 }
 
@@ -2037,6 +2035,7 @@ function media_upload_flash_bypass() {
 	</p>
 	<?php
 }
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
 /**
  * {@internal Missing Short Description}}
@@ -2050,10 +2049,15 @@ function media_upload_html_bypass() {
 	</p>
 	<?php
 }
-
-add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
+function media_upload_text_after() {
+	?>
+	<span class="after-file-upload"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></span>
+	<?php
+}
+add_action('post-upload-ui', 'media_upload_text_after', 5);
+
 /**
  * {@internal Missing Short Description}}
  *