Changeset 22902

Timestamp:

11/28/2012 08:17:57 PM (12 years ago)

Author:

ryan

Message:

Route uploads through async-upload.php instead of admin-ajax.php.

Props nacin, koopersmith
fixes #22622

Location:

trunk

Files:

• wp-admin/async-upload.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/async-upload.php

@@ -14 +14 @@
     require_once('../wp-load.php');
 
-// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-    $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-    $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-    $_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
-unset($current_user);
+if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
+    // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
+    if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+        $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+    elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+        $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+    if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
+        $_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+    unset($current_user);
+}
+
 require_once('./admin.php');
+
+if ( !current_user_can('upload_files') )
+    wp_die(__('You do not have permission to upload files.'));
 
 header('Content-Type: text/html; charset=' . get_option('blog_charset'));
 
-if ( !current_user_can('upload_files') )
-    wp_die(__('You do not have permission to upload files.'));
+if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
+    define( 'DOING_AJAX', true );
+    include ABSPATH . 'wp-admin/includes/ajax-actions.php';
+
+    send_nosniff_header();
+    nocache_headers();
+
+    wp_ajax_upload_attachment();
+    die( '0' );
+}
 
 // just fetch the detail form for that attachment

trunk/wp-includes/media.php

@@ -1247 +1247 @@
         'multiple_queues'     => true,
         'max_file_size'       => $max_upload_size . 'b',
-        'url'                 => admin_url( 'admin-ajax.php', 'relative' ),
+        'url'                 => admin_url( 'async-upload.php', 'relative' ),
         'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
         'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),