Changeset 28871

Timestamp:

06/27/2014 09:31:28 PM (11 years ago)

Author:

wonderboymusic

Message:

In deprecated media iframe code, attachment_fields_to_save filter should not be called twice after initial image upload in post.

Props SergeyBiryukov.
Fixes #20720.

File:

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

trunk/src/wp-admin/includes/media.php

@@ -774 +774 @@
     }
 
-    if ( !empty($_POST) ) {
+    if ( isset( $_POST['save'] ) ) {
+        $errors['upload_notice'] = __('Saved.');
+        return media_upload_gallery();
+    } elseif ( ! empty( $_POST ) ) {
         $return = media_upload_form_handler();
 
@@ -781 +784 @@
         if ( is_array($return) )
             $errors = $return;
-    }
-
-    if ( isset($_POST['save']) ) {
-        $errors['upload_notice'] = __('Saved.');
-        return media_upload_gallery();
     }