Changeset 11638 for trunk/wp-admin/media-upload.php

Timestamp:

06/25/2009 06:09:22 AM (17 years ago)

Author:

ryan

Message:

Don't lose upload error messages. Props filosofo. fixes #10238 for trunk

File:

• trunk/wp-admin/media-upload.php (modified) (2 diffs)

trunk/wp-admin/media-upload.php

@@ -30 +30 @@
 
 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) ) {
@@ -49 +40 @@
                         $id = false;
                 }
+        }
+
+        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) );
         }