Wordpress 2.9

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

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index ccb364e00f0d6745044c4da30f3f313cfb2541ff..0bb74557792ef79a4c88bbb61e3720f464e7faa9 100644 (file)
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -17,6 +17,9 @@ if (!current_user_can('upload_files'))
 
 wp_enqueue_script('swfupload-all');
 wp_enqueue_script('swfupload-handlers');
+wp_enqueue_script('image-edit');
+wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_style('imgareaselect');
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
@@ -29,16 +32,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
@@ -50,6 +44,16 @@ 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'); ?>