<!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>[54546] branches/3.7/src: Grouped backports to the 3.7 branch.</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/54546">54546</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/54546","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>2022-10-17 17:39:41 +0000 (Mon, 17 Oct 2022)</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'>Grouped backports to the 3.7 branch.
- Posts, Post types: Apply KSES to post-by-email content,
- General: Validate host on "Are you sure?" screen,
- Posts, Post types: Remove emails from post-by-email logs,
- Pings/trackbacks: Apply KSES to all trackbacks,
- Comments: Apply kses when editing comments,
- Mail: Reset PHPMailer properties between use,
- Widgets: Escape RSS error messages for display.
Merges <a href="https://core.trac.wordpress.org/changeset/54521">[54521]</a>, <a href="https://core.trac.wordpress.org/changeset/54522">[54522]</a>, <a href="https://core.trac.wordpress.org/changeset/54523">[54523]</a>, <a href="https://core.trac.wordpress.org/changeset/54525">[54525]</a>, <a href="https://core.trac.wordpress.org/changeset/54527">[54527]</a>, <a href="https://core.trac.wordpress.org/changeset/54529">[54529]</a>, <a href="https://core.trac.wordpress.org/changeset/54541">[54541]</a> to the 3.7 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, matveb, talldanwp.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpincludescommentphp">branches/3.7/src/wp-includes/comment.php</a></li>
<li><a href="#branches37srcwpincludesdefaultwidgetsphp">branches/3.7/src/wp-includes/default-widgets.php</a></li>
<li><a href="#branches37srcwpincludesfunctionsphp">branches/3.7/src/wp-includes/functions.php</a></li>
<li><a href="#branches37srcwpincludespluggablephp">branches/3.7/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches37srcwpmailphp">branches/3.7/src/wp-mail.php</a></li>
<li><a href="#branches37srcwptrackbackphp">branches/3.7/src/wp-trackback.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7
</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/3.7 2022-10-17 17:39:34 UTC (rev 54545)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7 2022-10-17 17:39:41 UTC (rev 54546)
</ins><a id="branches37"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7</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.9:42434,49653
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43684-43686,43836,43853,43988,43994,44014,44017,44047
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26087,26091,26095,26148-26149,26186,26252,26304-26305,26307,26318,26448-26449,26512,26705,26734,26782,26871,26909-26910,26927,26940,27053,27086,27168,27299,27385,27721,27848,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,28796,28799,28873,28943,28961,28964,28966-28967,29120,29251,29270,29327,29378,29381-29382,29397,29404,29503,29631,29783,29860,29869,29954,30001,30060,30062-30063,30066,30282,30285,30289-30291,30337,30412,30417,30425,30430,30438,30443,30458,30466,30513-30514,30516-30521,30524,30526,30529-30530,30549,31253-31254,31257-31259,31557,31622,31650,32356,32988,33124,33142,33726,35513,35521,35538,35540-35541,36083,36435,36861-36865,37019-37020,37212,37612,37651,38111,38524,38757,39113,39115-39117,39360-39361,39478,39645
,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40241,40255,40257,40259,40269,40271,40400,40446,40449,40457,40538,40604,40677,40692,40704,40723,40736,40833,41082,41303,41306,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42460-42461,42887,42892-42893,42989,43320,43323,43511-43512,43977,44021,44048,44176,44219,44842,44993,45445-45446,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45997,46320,46408-46409,46474-46478,46483,46485,46682,46895,46996,46999,47225,47341,47867,47872,47912,47947-47951,48121,48241,48705,49162,49168-49169,49175,49204,49227-49228,49244,49267,49335,49358,49360,49362,49369,49371,49380,49382-49388,49548,49636,49781-49784,49786,49836,49876,49933,49938-49939,50185,50268,50285,50298,50379,50387,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454,52456-52457,52844,
53112,53581-53582,53592,53958-53960,54322
</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:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26087,26091,26095,26148-26149,26186,26252,26304-26305,26307,26318,26448-26449,26512,26705,26734,26782,26871,26909-26910,26927,26940,27053,27086,27168,27299,27385,27721,27848,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,28796,28799,28873,28943,28961,28964,28966-28967,29120,29251,29270,29327,29378,29381-29382,29397,29404,29503,29631,29783,29860,29869,29954,30001,30060,30062-30063,30066,30282,30285,30289-30291,30337,30412,30417,30425,30430,30438,30443,30458,30466,30513-30514,30516-30521,30524,30526,30529-30530,30549,31253-31254,31257-31259,31557,31622,31650,32356,32988,33124,33142,33726,35513,35521,35538,35540-35541,36083,36435,36861-36865,37019-37020,37212,37612,37651,38111,38524,38757,39113,39115-39117,39360-39361,39478,39645
,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40241,40255,40257,40259,40269,40271,40400,40446,40449,40457,40538,40604,40677,40692,40704,40723,40736,40833,41082,41303,41306,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42460-42461,42887,42892-42893,42989,43320,43323,43511-43512,43977,44021,44048,44176,44219,44842,44993,45445-45446,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45997,46320,46408-46409,46474-46478,46483,46485,46682,46895,46996,46999,47225,47341,47867,47872,47912,47947-47951,48121,48241,48705,49162,49168-49169,49175,49204,49227-49228,49244,49267,49335,49358,49360,49362,49369,49371,49380,49382-49388,49548,49636,49781-49784,49786,49836,49876,49933,49938-49939,50185,50268,50285,50298,50379,50387,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454,52456-52457,52844,
53112,53581-53582,53592,53958-53960,54322,54521-54523,54525,54527,54529,54541
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7/src
</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/3.7/src 2022-10-17 17:39:34 UTC (rev 54545)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7/src 2022-10-17 17:39:41 UTC (rev 54546)
</ins><a id="branches37src"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7/src</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/src:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9/src:42434,49653
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0/src:43988,43994,44014,44017,44047
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26087,26091,26095,26149,26252,26307,26318,26449,26512,26705,26871,26909-26910,26940,27053,27086,27168,27299,27385,27721,27848,27906,27928,28113,28129,28796,28799,28873,28943,28961,28964,28966-28967,29120,29251,29270,29503,29783,29860,29869,29954,30001,30060,30062-30063,30066,30282,30285,30289-30291,30513-30514,30516-30521,30524,30526,30529-30530,30549,31253-31254,31257-31259,31557,31622,31650,32356,32988,33124,33142,33726,35513,35521,35538,35540-35541,36083,36435,36861-36865,37019-37020,37212,37612,37651,38111,38524,38757,39113,39115-39117,39478,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40241,40255,40257,40259,40269,40271,40400,40446,40449,40457,40538,40604,40677,40692,40704,40723,40736,40833,41082,41303,41306,4
1393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42460-42461,42887,42892-42893,42989,43320,43323,43511-43512,43977,44021,44048,44176,44219,44842,44993,45445-45446,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45997,46320,46408-46409,46474-46478,46483,46485,46682,46895,46996,46999,47225,47341,47867,47872,47912,47947-47951,48121,48241,48705,49267,49335,49358,49360,49362,49380,49382-49388,49636,49876,49933,49939,50185,50379,50387,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50799,52454,52456-52457,52844,53958-53960,54322
</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/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26087,26091,26095,26149,26252,26307,26318,26449,26512,26705,26871,26909-26910,26940,27053,27086,27168,27299,27385,27721,27848,27906,27928,28113,28129,28796,28799,28873,28943,28961,28964,28966-28967,29120,29251,29270,29503,29783,29860,29869,29954,30001,30060,30062-30063,30066,30282,30285,30289-30291,30513-30514,30516-30521,30524,30526,30529-30530,30549,31253-31254,31257-31259,31557,31622,31650,32356,32988,33124,33142,33726,35513,35521,35538,35540-35541,36083,36435,36861-36865,37019-37020,37212,37612,37651,38111,38524,38757,39113,39115-39117,39478,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40241,40255,40257,40259,40269,40271,40400,40446,40449,40457,40538,40604,40677,40692,40704,40723,40736,40833,41082,41303,41306,4
1393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42460-42461,42887,42892-42893,42989,43320,43323,43511-43512,43977,44021,44048,44176,44219,44842,44993,45445-45446,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45997,46320,46408-46409,46474-46478,46483,46485,46682,46895,46996,46999,47225,47341,47867,47872,47912,47947-47951,48121,48241,48705,49267,49335,49358,49360,49362,49380,49382-49388,49636,49876,49933,49939,50185,50379,50387,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50799,52454,52456-52457,52844,53958-53960,54322,54521-54523,54525,54527,54529,54541
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches37srcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-includes/comment.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-includes/comment.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1508,6 +1508,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comment ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_comment = false;
+ if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
+ $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
+ }
+
+ if ( $filter_comment ) {
+ add_filter( 'pre_comment_content', 'wp_filter_kses' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Escape data pulled from DB.
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = wp_slash($comment);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1518,6 +1527,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentarr = wp_filter_comment( $commentarr );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $filter_comment ) {
+ remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Now extract the merged array.
</span><span class="cx" style="display: block; padding: 0 10px"> extract(wp_unslash($commentarr), EXTR_SKIP);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches37srcwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-includes/default-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-includes/default-widgets.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-includes/default-widgets.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error($rss) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() || current_user_can('manage_options') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), esc_html( $rss->get_error_message() ) ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $show_date = (int) $show_date;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($error) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p class="widget-error"><strong>' . sprintf( __('RSS Error: %s'), $error) . '</strong></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p class="widget-error"><strong>' . sprintf( __('RSS Error: %s'), esc_html( $error ) ) . '</strong></p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $inputs['url'] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="branches37srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-includes/functions.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-includes/functions.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2221,8 +2221,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $html = __( 'Are you sure you want to do this?' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_get_referer() )
- $html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_get_referer() ) {
+ $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
+ $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
+ $html .= '</p><p>';
+ $html .= sprintf(
+ '<a href="%s">%s</a>',
+ esc_url( $wp_http_referer ),
+ __( 'Please try again.' )
+ );
+ }
</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"> wp_die( $html, $title, array('response' => 403) );
</span></span></pre></div>
<a id="branches37srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-includes/pluggable.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-includes/pluggable.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,6 +313,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->ClearCCs();
</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->ClearCustomHeaders();
</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->ClearReplyTos();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $phpmailer->Body = '';
+ $phpmailer->AltBody = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // From email and name
</span><span class="cx" style="display: block; padding: 0 10px"> // If we don't have a name from the input headers
</span></span></pre></div>
<a id="branches37srcwpmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-mail.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-mail.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +56,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __('There doesn’t seem to be any new mail.') );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $count; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $pop3->get($i);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +122,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author = trim($line);
</span><span class="cx" style="display: block; padding: 0 10px"> $author = sanitize_email($author);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_email($author) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
</del><span class="cx" style="display: block; padding: 0 10px"> $userdata = get_user_by('email', $author);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $userdata ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = $userdata->ID;
</span></span></pre></div>
<a id="branches37srcwptrackbackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-trackback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-trackback.php 2022-10-17 17:39:34 UTC (rev 54545)
+++ branches/3.7/src/wp-trackback.php 2022-10-17 17:39:41 UTC (rev 54546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp( array( 'tb' => '1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Response to a trackback.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>