From 20bbf977a2a7129818a20906cf556c32db52c22a Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 7 Dec 2010 19:42:57 +0000
Subject: [PATCH] Fix the background colors for the Select Files upload
 buttons. props TECannon. fixes #8545.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/images/upload-classic.png | Bin 0 -> 1631 bytes
 wp-admin/images/upload-fresh.png   | Bin 0 -> 1051 bytes
 wp-admin/includes/media.php        |  14 ++++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 wp-admin/images/upload-classic.png
 create mode 100644 wp-admin/images/upload-fresh.png

diff --git a/wp-admin/images/upload-classic.png b/wp-admin/images/upload-classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..beda3e4369ac07423c2afb1b678cc42a057066fb
GIT binary patch
literal 1631
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
Q1$-PJSDdF4cP}~RUx9rYl>h($

literal 0
HcmV?d00001

diff --git a/wp-admin/images/upload-fresh.png b/wp-admin/images/upload-fresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..92fd355c82ed81690fdc75dec27e0ddeeaa1a361
GIT binary patch
literal 1051
zcmV+$1mydPP)<h;3K|Lk000e1NJLTq004vl003MF1ONa41t8UK000BxNkl<Zc-rmU
z&1)K49LDkU*GliA*j2j8s=+^?xG8O+0h5*+N+_*#p{WpVZiYYyk|sA5G&-5q_?DUY
zGR{kG&G#-&2B${huIH!E#;p%Hp5NyjkBXROLK72%GNlx!jDbm$3CYi{;x_>`DxA|}
z$Q@~Z-7%!cITdOI^F@p?sN!=cC_YsT#>pZ^>{Az2LYzALjN&3f3@(@o%>@RbE~3VF
zu{BJY@|_wHYC;8%UxMRNVS@U>3I7VuKQvJ$ZSh64F;NE$xD}o;`>4v?3QJ-_%BYg~
z8X_V}s0tpT@J#rEI>03m9+v}@$xnRY`H6|LITl~UDNVhybeRZ_t5=p0HBRva=S<HU
zdit!2t)YrRko1TuV}YqAJwjJuaEc?U1cy_M`x+jY<u`2Fj8dL9Hs2PTWvti@Ob%0R
z*d<CFV$xWq*bxyo?2%`KM`Ti*M{JO1kDJ9scofO9%`q0!RCE3mi(|IQQpB4tqEC(;
zu0;v<H9O?!CyVIvlusf#{}WH?#zpw#D2g@gA~}3rM3Hx*75g1UBGiB<^h6iY;|T-Q
z-@Fp9*ah}bc}($&ZIVZ=^Fut{c3DGZxmn>Yf1onrYX}L+pt38)X24_AI+l36wOB{x
zITB5`6DAyyNBzZ1(RAzKvB@54Ko(o1SH`i)GSIU|L39z@de(^W*<d&IPPr_*Y~am2
zVvP?B1?B^5GmnUf=#XOzTT}@)Tjc0GG|P`<*~H+SLCSNE!6sQgJ~Yc%vCBN?S*i^?
zLxyKOr@TzDSDgPF=fB~QGu%{vF<j0#<jr!<-@;1$(;*p)two&wUgXc``+3ga6<NcO
zA-hS=FNj@Nju=sxalZ7S>z?yph^}GGSdZa(j>LP!k>>oSc%iz|obQS^%dzJCU=_{z
zs|}u^=6qXx5w_<1uj2PUziQ5ZEq*t=5OaQ4^y!H1jPqq59r`oL`9-lc6z4hrv&b`b
zpBHid4z8#(mM%NXIsYvuT&BK)OHO#Z;{5-?`2h|sZ0aeGO$#USUya|22<g+Hhet@-
zUm+en8uSV0i}11Ob1Uj$c}pJ~KUsuN6G!Cfe23<J6)Gac#u0lu-@%SA+v(F2ec4Wr
zJ`pOQK`46G2x$<YZdP~9(8WQu7>O@pL<?mx5f3u~O;lrUg(dT{oeNZbb=3|LbyNdi
zykZAjpe)AXw|B-^sMc!B50@6or6s<IHjZ9djzsT;kMzniqR*A+(-CbwYv}2-BesUl
zZ2Ht5(GhuQsFU=FSg5WTiYj5q)x1#6%(BHbZt4#dx?Iy*Y?evIzD&JhUoKGW{{YvW
VipGV^pvM3J002ovPDHLkV1l_X_iz9J

literal 0
HcmV?d00001

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 428bf4a35..e1575c85d 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1406,7 +1406,7 @@ function media_upload_header() {
  * @param unknown_type $errors
  */
 function media_upload_form( $errors = null ) {
-	global $type, $tab;
+	global $type, $tab, $pagenow;
 
 	$flash_action_url = admin_url('async-upload.php');
 
@@ -1477,6 +1477,16 @@ foreach ( $post_params as $param => & $val )
 	$p[] = "\t\t'$param' : '$val'";
 $post_params_str = implode( ", \n", $p );
 
+// #8545. wmode=transparent cannot be used with SWFUpload
+if ( 'media-new.php' == $pagenow ) {
+	$upload_image_path = get_user_option( 'admin_color' );
+	if ( 'classic' != $upload_image_path )
+		$upload_image_path = 'fresh';
+	$upload_image_path = admin_url( 'images/upload-' . $upload_image_path . '.png?ver=20101205' );
+} else {
+	$upload_image_path = includes_url( 'images/upload.png?ver=20100531' );
+}
+
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -1488,7 +1498,7 @@ SWFUpload.onload = function() {
 			button_height: "23",
 			button_width: "132",
 			button_text_top_padding: 3,
-			button_image_url: '<?php echo includes_url('images/upload.png?ver=20100531'); ?>',
+			button_image_url: '<?php echo $upload_image_path; ?>',
 			button_placeholder_id: "flash-browse-button",
 			upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
 			flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",