Ticket #16820: 16820.diff

wp-admin/media-upload.php

@@ -35 +35 @@
         wp_die(__("You are not allowed to be here"));
 
 if ( isset($_GET['inline']) ) {
-        $errors = array();
-
         if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                 // Upload File button was clicked
                 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
                 unset($_FILES);
-                if ( is_wp_error($id) ) {
-                        $errors['upload_error'] = $id;
-                        $id = false;
-                }
+                if ( is_wp_error($id) )
+                        wp_die( $id );
         }
 
         if ( isset($_GET['upload-page-form']) ) {
-                $errors = array_merge($errors, (array) media_upload_form_handler());
-
-                $location = 'upload.php';
+                $errors = (array) media_upload_form_handler();
                 if ( $errors )
-                        $location .= '?message=3';
-
-                wp_redirect( admin_url($location) );
-                exit;
+                        wp_die( implode(' ', $errors) );
         }
 
         $title = __('Upload New Media');