Wordpress 2.8.3-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / media.php

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index ab7cc58b143fbe88d9271718c0037482f3b6472f..e6e7b6b89136151a048393fc38e37bcf339ffd1b 100644 (file)
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -369,7 +369,6 @@ EOF;
        printf($context, $out);
 }
 add_action( 'media_buttons', 'media_buttons' );
-add_action('media_upload_media', 'media_upload_handler');
 
 /**
  * {@internal Missing Short Description}}
@@ -381,7 +380,7 @@ add_action('media_upload_media', 'media_upload_handler');
 function media_upload_form_handler() {
        check_admin_referer('media-form');
 
-       $errors = array();
+       $errors = null;
 
        if ( isset($_POST['send']) ) {
                $keys = array_keys($_POST['send']);
@@ -1312,10 +1311,10 @@ var swfu;
 SWFUpload.onload = function() {
        var settings = {
                        button_text: '<span class="button"><?php _e('Select Files'); ?></span>',
-                       button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; }',
+                       button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif; }',
                        button_height: "24",
                        button_width: "132",
-                       button_text_top_padding: 1,
+                       button_text_top_padding: 2,
                        button_image_url: '<?php echo includes_url('images/upload.png'); ?>',
                        button_placeholder_id: "flash-browse-button",
                        upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",