Ticket #8545: 8545.3.diff

wp-admin/includes/media.php

@@ -1406 +1406 @@
  * @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 +1477 @@
         $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_color = get_user_option( 'admin_color' );
+        if ( 'classic' != $upload_color )
+                $upload_color = 'fresh';
+        $upload_color = '-' . $upload_color;
+} else {
+        $upload_color = '';
+}
+
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -1488 +1498 @@
                         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 includes_url('images/upload' . $upload_color . '.png?ver=20101205'); ?>',
                         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'); ?>",