<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22845] trunk/wp-admin/includes/ajax-actions.php: Don't use wp_send_json_* handlers in the upload-attachment XHR handler.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22845">22845</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-26 20:12:50 +0000 (Mon, 26 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/22446">#22446</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (22844 => 22845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-11-26 16:58:36 UTC (rev 22844)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-11-26 20:12:50 UTC (rev 22845)
</span><span class="lines">@@ -1585,12 +1585,12 @@
</span><span class="cx"> check_ajax_referer( 'media-form' );
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'upload_files' ) )
</span><del>- wp_send_json_error();
</del><ins>+ wp_die();
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_REQUEST['post_id'] ) ) {
</span><span class="cx"> $post_id = $_REQUEST['post_id'];
</span><span class="cx"> if ( ! current_user_can( 'edit_post', $post_id ) )
</span><del>- wp_send_json_error();
</del><ins>+ wp_die();
</ins><span class="cx"> } else {
</span><span class="cx"> $post_id = null;
</span><span class="cx"> }
</span><span class="lines">@@ -1601,20 +1601,26 @@
</span><span class="cx"> if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
</span><span class="cx"> $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'], false );
</span><span class="cx"> if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
</span><del>- wp_send_json_error( array(
</del><ins>+ echo json_encode( array(
+ 'success' => false,
</ins><span class="cx"> 'message' => __( 'The uploaded file is not a valid image. Please try again.' ),
</span><span class="cx"> 'filename' => $_FILES['async-upload']['name'],
</span><span class="cx"> ) );
</span><ins>+
+ wp_die();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $attachment_id ) ) {
</span><del>- wp_send_json_error( array(
</del><ins>+ echo json_encode( array(
+ 'success' => false,
</ins><span class="cx"> 'message' => $attachment_id->get_error_message(),
</span><span class="cx"> 'filename' => $_FILES['async-upload']['name'],
</span><span class="cx"> ) );
</span><ins>+
+ wp_die();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
</span><span class="lines">@@ -1626,9 +1632,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
</span><del>- wp_send_json_error();
</del><ins>+ wp_die();
</ins><span class="cx">
</span><del>- wp_send_json_success( $attachment );
</del><ins>+ echo json_encode( array(
+ 'success' => true,
+ 'data' => $attachment,
+ ) );
+
+ wp_die();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_ajax_image_editor() {
</span></span></pre>
</div>
</div>
</body>
</html>