Changeset 11639

Timestamp:

06/25/2009 06:09:41 AM (15 years ago)

Author:

ryan

Message:

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

Location:

branches/2.8/wp-admin

Files:

• includes/media.php (modified) (1 diff)
• media-upload.php (modified) (2 diffs)

branches/2.8/wp-admin/includes/media.php

@@ -381 +381 @@
     check_admin_referer('media-form');
 
-    $errors = array();
+    $errors = null;
 
     if ( isset($_POST['send']) ) {

branches/2.8/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) );
     }