Ticket #21329: 21329-2.diff

wp-admin/includes/media.php

@@ -629 +629 @@
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Returns wp_iframe with the proper upload form for media uploads
+ * added to the media_upload filter in media-upload.php
  *
- * @since 2.5.0
+ * @since 3.5.0
  *
- * @return unknown
+ * @return HTML from the wp_iframe function
  */
-function media_upload_gallery() {
+function media_upload() {
         $errors = array();
-
-        if ( !empty($_POST) ) {
+        $current_filter = current_filter();
+        $type = str_replace( 'media_upload_' , '' , $current_filter );
+        
+        if ( !empty($_POST) || empty($type) ) {
                 $return = media_upload_form_handler();
-
                 if ( is_string($return) )
                         return $return;
                 if ( is_array($return) )
@@ -648 +650 @@
         }
 
         wp_enqueue_script('admin-gallery');
-        return wp_iframe( 'media_upload_gallery_form', $errors );
+        
+        switch($type) {
+                case 'library' :
+                                $return = 'media_upload_library_form';
+                        break;
+                case 'gallery' :
+                                $return = 'media_upload_gallery_form';
+                        break;
+                default :
+                                $return = 'wp_media_upload_handler';
+                        break;                          
+        }
+        return wp_iframe( $return , $errors );
 }
 
 /**
@@ -658 +672 @@
  *
  * @return unknown
  */
+function media_upload_gallery() {
+        media_upload( 'gallery' );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @return unknown
+ */
 function media_upload_library() {
-        $errors = array();
-        if ( !empty($_POST) ) {
-                $return = media_upload_form_handler();
-
-                if ( is_string($return) )
-                        return $return;
-                if ( is_array($return) )
-                        $errors = $return;
-        }
-
-        return wp_iframe( 'media_upload_library_form', $errors );
+        media_upload( 'library' );
 }
 
 /**
@@ -2128 +2143 @@
 add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action( 'media_upload_image', 'media_upload' );
+add_action( 'media_upload_audio', 'media_upload' );
+add_action( 'media_upload_video', 'media_upload' );
+add_action( 'media_upload_file',  'media_upload' );
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter( 'media_upload_gallery', 'media_upload' );
+add_filter( 'media_upload_library', 'media_upload' );