Changeset 22845

Timestamp:

11/26/2012 08:12:50 PM (12 years ago)

Author:

nacin

Message:

Don't use wp_send_json_* handlers in the upload-attachment XHR handler.

The difference is the content type: application/json (which jQuery deserializes automatically for us) and the default text/html.

jQuery correctly handles application/json requests for IE, so we can continue to use the wp_send_json_* handlers elsewhere. Plupload rolls its own requests and does not handle application/json correctly. So, keep the standard text/html content type on upload-attachment.

props koopersmith.
see #22446.

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (4 diffs)

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

@@ -1586 +1586 @@
 
     if ( ! current_user_can( 'upload_files' ) )
-        wp_send_json_error();
+        wp_die();
 
     if ( isset( $_REQUEST['post_id'] ) ) {
         $post_id = $_REQUEST['post_id'];
         if ( ! current_user_can( 'edit_post', $post_id ) )
-            wp_send_json_error();
+            wp_die();
     } else {
         $post_id = null;
@@ -1602 +1602 @@
         $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(
+            echo json_encode( array(
+                'success'  => false,
                 'message' => __( 'The uploaded file is not a valid image. Please try again.' ),
                 'filename' => $_FILES['async-upload']['name'],
             ) );
+
+            wp_die();
         }
     }
@@ -1612 +1615 @@
 
     if ( is_wp_error( $attachment_id ) ) {
-        wp_send_json_error( array(
+        echo json_encode( array(
+            'success'  => false,
             'message'  => $attachment_id->get_error_message(),
             'filename' => $_FILES['async-upload']['name'],
         ) );
+
+        wp_die();
     }
 
@@ -1627 +1633 @@
 
     if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
-        wp_send_json_error();
-
-    wp_send_json_success( $attachment );
+        wp_die();
+
+    echo json_encode( array(
+        'success' => true,
+        'data'    => $attachment,
+    ) );
+
+    wp_die();
 }