<!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>[45948] branches/4.6/src/wp-admin/includes/ajax-actions.php: Escape the output in `wp_ajax_upload_attachment()`.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45948">45948</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45948","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-04 16:35:12 +0000 (Wed, 04 Sep 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Escape the output in `wp_ajax_upload_attachment()`.
Merges <a href="https://core.trac.wordpress.org/changeset/45936">[45936]</a> to the 4.6 branch.
Props whyisjake, sstoqnov.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches46srcwpadminasyncuploadphp">branches/4.6/src/wp-admin/async-upload.php</a></li>
<li><a href="#branches46srcwpadminincludesajaxactionsphp">branches/4.6/src/wp-admin/includes/ajax-actions.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches46">branches/4.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.6 2019-09-04 16:34:50 UTC (rev 45947)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.6 2019-09-04 16:35:12 UTC (rev 45948)
</ins><a id="branches46"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43988,43994,44014,44017,44047,45005
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:38181,38183,38185-38186,38189,38191,38194,38196,38199,38201,38205,38207,38209,38211-38213,38215-38216,38218,38221,38225,38227,38234-38235,38242,38244,38248,38251,38255,38257,38261,38263,38267,38274,38276-38277,38281,38286,38349,38415,38426-38427,38429-38431,38433,38439,38441,38443,38447,38524,38580,38727,38894,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40269,40271,40400,40538,40604,40677,40689,40692,40704,40716,40723,40736,40851-40852,41072,41393,41395,41397-41398,41448,41457,41470,41483,41496,41662,41870,42056,42119-42120,42258-42261,42424,42433,42892-42894,44021,44048,44833,44842,44993
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:38181,38183,38185-38186,38189,38191,38194,38196,38199,38201,38205,38207,38209,38211-38213,38215-38216,38218,38221,38225,38227,38234-38235,38242,38244,38248,38251,38255,38257,38261,38263,38267,38274,38276-38277,38281,38286,38349,38415,38426-38427,38429-38431,38433,38439,38441,38443,38447,38524,38580,38727,38894,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40269,40271,40400,40538,40604,40677,40689,40692,40704,40716,40723,40736,40851-40852,41072,41393,41395,41397-41398,41448,41457,41470,41483,41496,41662,41870,42056,42119-42120,42258-42261,42424,42433,42892-42894,44021,44048,44833,44842,44993,45936
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches46srcwpadminasyncuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-admin/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-admin/async-upload.php 2019-09-04 16:34:50 UTC (rev 45947)
+++ branches/4.6/src/wp-admin/async-upload.php 2019-09-04 16:35:12 UTC (rev 45948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
</span></span></pre></div>
<a id="branches46srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-admin/includes/ajax-actions.php 2019-09-04 16:34:50 UTC (rev 45947)
+++ branches/4.6/src/wp-admin/includes/ajax-actions.php 2019-09-04 16:35:12 UTC (rev 45948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2022,7 +2022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => __( 'Sorry, you are not allowed to upload files.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filename' => $_FILES['async-upload']['name'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filename' => esc_html( $_FILES['async-upload']['name'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2036,7 +2036,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => __( "You don't have permission to attach files to this post." ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filename' => $_FILES['async-upload']['name'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filename' => esc_html( $_FILES['async-upload']['name'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2060,7 +2060,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => __( 'The uploaded file is not a valid image. Please try again.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filename' => $_FILES['async-upload']['name'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filename' => esc_html( $_FILES['async-upload']['name'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2075,7 +2075,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $attachment_id->get_error_message(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filename' => $_FILES['async-upload']['name'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filename' => esc_html( $_FILES['async-upload']['name'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>