From 77ed607d8e34c58897ac6bd1a366839a859f0f32 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <koop@git.wordpress.org>
Date: Thu, 22 Nov 2012 10:57:43 +0000
Subject: [PATCH] Media: Make the pre-upload-ui hooks share an element with the
 post-upload-ui hooks. see #22186, #21390.

git-svn-id: https://develop.svn.wordpress.org/trunk@22819 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/media.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 545aee7612..13f3e9feda 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1484,17 +1484,14 @@ function wp_print_media_templates( $attachment ) {
 
 	<script type="text/html" id="tmpl-uploader-inline">
 		<div class="uploader-inline-content">
-			<div class="pre-upload-ui">
-				<?php do_action( 'pre-upload-ui' ); ?>
-				<?php do_action( 'pre-plupload-upload-ui' ); ?>
-			</div>
-
 			<div class="upload-ui">
 				<h3><?php _e( 'Drop files anywhere to upload' ); ?></h3>
 				<a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
 			</div>
 
 			<div class="post-upload-ui">
+				<?php do_action( 'pre-upload-ui' ); ?>
+				<?php do_action( 'pre-plupload-upload-ui' ); ?>
 				<?php do_action( 'post-plupload-upload-ui' ); ?>
 				<?php do_action( 'post-upload-ui' ); ?>
 			</div>