Changeset 31430 for branches/4.1/src/wp-admin/includes/ajax-actions.php

Timestamp:

02/12/2015 01:32:26 AM (12 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, and
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.

Merges [31429] to the 4.1 branch.
Fixes #31037.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/ajax-actions.php (modified) (4 diffs)

branches/4.1/src/wp-admin/includes/ajax-actions.php

@@ -1833 +1833 @@
 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();
         }
 
@@ -1844 +1854 @@
                 $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 {
@@ -1859 +1874 @@
                 $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'], false );
                 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();
         }
 
@@ -1886 +1911 @@
                 wp_die();
 
-        wp_send_json_success( $attachment );
+        echo wp_json_encode( array(
+                'success' => true,
+                'data'    => $attachment,
+        ) );
+
+        wp_die();
 }