Changeset 31429 for trunk

Timestamp:

02/12/2015 01:14:47 AM (10 years ago)

Author:

dd32

Message:

Prevent IE9 and lower displaying the download file dialogue when attempting to upload using the html4 Plupload handler.

The HTML4 Plupload handler uses a hidden iframe to POST the upload form,
Unfortunately Internet Explorer 9 doesn't support the application/json
content-type which wp_send_json_success() and requires text/html instead.

This partially reverts [30354], keeping the better error messages.

Fixes #31037 for trunk.

Location:

trunk/src/wp-admin

Files:

• async-upload.php (modified) (2 diffs)
• includes/ajax-actions.php (modified) (4 diffs)

trunk/src/wp-admin/async-upload.php

@@ -33 +33 @@
 require_once( ABSPATH . 'wp-admin/admin.php' );
 
+header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+
 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
     include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
@@ -46 +48 @@
     wp_die( __( 'You do not have permission to upload files.' ) );
 }
-
-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
 
 // just fetch the detail form for that attachment

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1846 +1846 @@
 function wp_ajax_upload_attachment() {
     check_ajax_referer( 'media-form' );
+    /*
+     * This function does not use wp_send_json_success() / wp_send_json_error()
+     * as the html4 Plupload handler requires a text/html content-type for older IE.
+     * See https://core.trac.wordpress.org/ticket/31037
+     */
 
     if ( ! current_user_can( 'upload_files' ) ) {
-        wp_send_json_error( array(
-            'message'  => __( "You don't have permission to upload files." ),
-            'filename' => $_FILES['async-upload']['name'],
+        echo wp_json_encode( array(
+            'success' => false,
+            'data'    => array(
+                'message'  => __( "You don't have permission to upload files." ),
+                'filename' => $_FILES['async-upload']['name'],
+            )
         ) );
+
+        wp_die();
     }
 
@@ -1857 +1867 @@
         $post_id = $_REQUEST['post_id'];
         if ( ! current_user_can( 'edit_post', $post_id ) ) {
-            wp_send_json_error( array(
-                'message'  => __( "You don't have permission to attach files to this post." ),
-                'filename' => $_FILES['async-upload']['name'],
+            echo wp_json_encode( array(
+                'success' => false,
+                'data'    => array(
+                    'message'  => __( "You don't have permission to attach files to this post." ),
+                    'filename' => $_FILES['async-upload']['name'],
+                )
             ) );
+
+            wp_die();
         }
     } else {
@@ -1872 +1887 @@
         $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
         if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
-            wp_send_json_error( array(
-                'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
+            echo wp_json_encode( array(
+                'success' => false,
+                'data'    => array(
+                    'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
+                    'filename' => $_FILES['async-upload']['name'],
+                )
+            ) );
+
+            wp_die();
+        }
+    }
+
+    $attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
+
+    if ( is_wp_error( $attachment_id ) ) {
+        echo wp_json_encode( array(
+            'success' => false,
+            'data'    => array(
+                'message'  => $attachment_id->get_error_message(),
                 'filename' => $_FILES['async-upload']['name'],
-            ) );
-        }
-    }
-
-    $attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
-
-    if ( is_wp_error( $attachment_id ) ) {
-        wp_send_json_error( array(
-            'message'  => $attachment_id->get_error_message(),
-            'filename' => $_FILES['async-upload']['name'],
+            )
         ) );
+
+        wp_die();
     }
 
@@ -1899 +1924 @@
         wp_die();
 
-    wp_send_json_success( $attachment );
+    echo wp_json_encode( array(
+        'success' => true,
+        'data'    => $attachment,
+    ) );
+
+    wp_die();
 }