<!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>[53977] branches/4.6/src/wp-includes: Grouped backports to the 4.6 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/53977">53977</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/53977","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-08-30 15:47:30 +0000 (Tue, 30 Aug 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 4.6 branch.
- Posts, Post Types: Escape output within `the_meta()`.
- General: Ensure bookmark query limits are numeric.
- Plugins: Escape output in error messages.
Merges [53958-53960] to the 4.6 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches46srcwpadminpluginsphp">branches/4.6/src/wp-admin/plugins.php</a></li>
<li><a href="#branches46srcwpincludesbookmarkphp">branches/4.6/src/wp-includes/bookmark.php</a></li>
<li><a href="#branches46srcwpincludesposttemplatephp">branches/4.6/src/wp-includes/post-template.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 2022-08-30 15:45:59 UTC (rev 53976)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.6 2022-08-30 15:47:30 UTC (rev 53977)
</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.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,45005
</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: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,38757,38894,39360-39361,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,41712,41870,41920,42056,42119-42120,42258-42261,42424,42433,42460-42461,42463,42887,42892-42894,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,45067,45321,45445,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45990,45997,46320,46404,46408-46409,46474-46478,46483
,46485,46682,46895,46996,46999,47225,47341,47404,47634-47635,47637-47638,47867-47869,47872-47873,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,49937-49939,50017,50126,50176,50185,50268,50285,50298,50379,50387,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50796,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454-52457,52844,53112,53581-53582,53592
</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,38757,38894,39360-39361,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,41712,41870,41920,42056,42119-42120,42258-42261,42424,42433,42460-42461,42463,42887,42892-42894,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,45067,45321,45445,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45990,45997,46320,46404,46408-46409,46474-46478,46483
,46485,46682,46895,46996,46999,47225,47341,47404,47634-47635,47637-47638,47867-47869,47872-47873,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,49937-49939,50017,50126,50176,50185,50268,50285,50298,50379,50387,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50796,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454-52457,52844,53112,53581-53582,53592,53958-53960
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches46srcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-admin/plugins.php 2022-08-30 15:45:59 UTC (rev 53976)
+++ branches/4.6/src/wp-admin/plugins.php 2022-08-30 15:47:30 UTC (rev 53977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin file 2: error message */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $plugin_file ) . '</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html( $error->get_error_message() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</p></div>';
</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">@@ -458,7 +458,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_transient( 'plugins_delete_result_' . $user_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error($delete_result) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), esc_html( $delete_result->get_error_message() ) ); ?></p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="branches46srcwpincludesbookmarkphp"></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-includes/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/bookmark.php 2022-08-30 15:45:59 UTC (rev 53976)
+++ branches/4.6/src/wp-includes/bookmark.php 2022-08-30 15:47:30 UTC (rev 53977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= " $exclusions $inclusions $search";
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= " ORDER BY $orderby $order";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['limit'] != -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query .= ' LIMIT ' . $r['limit'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query .= ' LIMIT ' . absint( $r['limit'] );
</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"> $results = $wpdb->get_results( $query );
</span></span></pre></div>
<a id="branches46srcwpincludesposttemplatephp"></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-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/post-template.php 2022-08-30 15:45:59 UTC (rev 53976)
+++ branches/4.6/src/wp-includes/post-template.php 2022-08-30 15:47:30 UTC (rev 53977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,10 +975,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @internal This will probably change at some point...
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 6.0.2 Use get_post_meta() to retrieve post meta and render manually.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function the_meta() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $keys = get_post_custom_keys() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<ul class='post-meta'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $keys as $key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -997,7 +997,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key Meta key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Meta value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>" . esc_html( $key ) . ":</span>" . esc_html( $value ) . "</li>\n", $key, $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</ul>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>