<!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>[22954] trunk: Properly pass WordPress uploading errors to wp.Uploader.</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/22954">22954</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-30 15:40:09 +0000 (Fri, 30 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Properly pass WordPress uploading errors to wp.Uploader.

Props koopersmith
fixes <a href="http://core.trac.wordpress.org/ticket/22655">#22655</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</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 (22953 => 22954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php        2012-11-30 15:20:51 UTC (rev 22953)
+++ trunk/wp-admin/includes/ajax-actions.php        2012-11-30 15:40:09 UTC (rev 22954)
</span><span class="lines">@@ -1602,9 +1602,11 @@
</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><span class="cx">                         echo json_encode( array(
</span><del>-                                'success'  =&gt; false,
-                                'message' =&gt; __( 'The uploaded file is not a valid image. Please try again.' ),
-                                'filename' =&gt; $_FILES['async-upload']['name'],
</del><ins>+                                'success' =&gt; false,
+                                'data'    =&gt; array(
+                                        'message'  =&gt; __( 'The uploaded file is not a valid image. Please try again.' ),
+                                        'filename' =&gt; $_FILES['async-upload']['name'],
+                                )
</ins><span class="cx">                         ) );
</span><span class="cx"> 
</span><span class="cx">                         wp_die();
</span><span class="lines">@@ -1615,9 +1617,11 @@
</span><span class="cx"> 
</span><span class="cx">         if ( is_wp_error( $attachment_id ) ) {
</span><span class="cx">                 echo json_encode( array(
</span><del>-                        'success'  =&gt; false,
-                        'message'  =&gt; $attachment_id-&gt;get_error_message(),
-                        'filename' =&gt; $_FILES['async-upload']['name'],
</del><ins>+                        'success' =&gt; false,
+                        'data'    =&gt; array(
+                                'message'  =&gt; $attachment_id-&gt;get_error_message(),
+                                'filename' =&gt; $_FILES['async-upload']['name'],
+                        )
</ins><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="cx">                 wp_die();
</span></span></pre></div>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22953 => 22954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css        2012-11-30 15:20:51 UTC (rev 22953)
+++ trunk/wp-includes/css/media-views.css        2012-11-30 15:40:09 UTC (rev 22954)
</span><span class="lines">@@ -790,7 +790,9 @@
</span><span class="cx"> 
</span><span class="cx"> .media-uploader-status {
</span><span class="cx">         position: relative;
</span><ins>+        margin: 0 auto;
</ins><span class="cx">         padding-bottom: 10px;
</span><ins>+        max-width: 400px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .media-sidebar .media-uploader-status {
</span><span class="lines">@@ -842,7 +844,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .upload-errors .upload-error {
</span><del>-        max-width: 400px;
</del><span class="cx">         margin: 8px auto 0 auto;
</span><span class="cx">         padding: 8px;
</span><span class="cx">         border: 1px #c00 solid;
</span><span class="lines">@@ -868,6 +869,7 @@
</span><span class="cx">         display: block;
</span><span class="cx">         padding-top: 8px;
</span><span class="cx">         color: #b44;
</span><ins>+        word-wrap: break-word;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .uploader-window {
</span></span></pre>
</div>
</div>

</body>
</html>