Wordpress 2.8.4

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

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 9ba2268f7055a0da18afbf8b1cd93ffe71b7cdc8..3766db8a611e0fec0783ef213f85ac5b59724bad 100644 (file)
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -15,9 +15,7 @@ require_once('admin.php');
 if (!current_user_can('upload_files'))
        wp_die(__('You do not have permission to upload files.'));
 
-wp_enqueue_script('swfupload');
-wp_enqueue_script('swfupload-swfobject');
-wp_enqueue_script('swfupload-queue');
+wp_enqueue_script('swfupload-all');
 wp_enqueue_script('swfupload-handlers');
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
@@ -31,16 +29,7 @@ if ( isset($action) && $action == 'edit' && !$ID )
        wp_die(__("You are not allowed to be here"));
 
 if ( isset($_GET['inline']) ) {
-
-       if ( isset($_GET['upload-page-form']) ) {
-               $errors = media_upload_form_handler();
-
-               $location = 'upload.php';
-               if ( $errors )
-                       $location .= '?message=3';
-
-               wp_redirect( admin_url($location) );
-       }
+       $errors = array();
 
        if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                // Upload File button was clicked
@@ -52,12 +41,22 @@ if ( isset($_GET['inline']) ) {
                }
        }
 
+       if ( isset($_GET['upload-page-form']) ) {
+               $errors = array_merge($errors, (array) media_upload_form_handler());
+
+               $location = 'upload.php';
+               if ( $errors )
+                       $location .= '?message=3';
+
+               wp_redirect( admin_url($location) );
+       }
+
        $title = __('Upload New Media');
        $parent_file = 'upload.php';
        require_once('admin-header.php'); ?>
        <div class="wrap">
        <?php screen_icon(); ?>
-       <h2><?php echo wp_specialchars( $title ); ?></h2>
+       <h2><?php echo esc_html( $title ); ?></h2>
 
        <form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&amp;upload-page-form=" class="media-upload-form type-form validate" id="file-form">
 
@@ -78,7 +77,7 @@ if ( isset($_GET['inline']) ) {
        <?php wp_nonce_field('media-form'); ?>
        <div id="media-items"> </div>
        <p>
-       <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+       <input type="submit" class="button savebutton" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
        </p>
        </form>
        </div>