<!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>[53970] branches/5.3/src: Grouped backports to the 5.3 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/53970">53970</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/53970","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:37:18 +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 5.3 branch.

- Posts, Post Types: Escape output within `the_meta()`.
- General: Ensure bookmark query limits are numeric.
- Plugins: Escape output in error messages.
- Build/Test Tools: Allow the PHPCS plugin in Composer configuration.

Merges [52412,53958-53960] to the 5.3 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches53composerjson">branches/5.3/composer.json</a></li>
<li><a href="#branches53srcwpadminpluginsphp">branches/5.3/src/wp-admin/plugins.php</a></li>
<li><a href="#branches53srcwpincludesbookmarkphp">branches/5.3/src/wp-includes/bookmark.php</a></li>
<li><a href="#branches53srcwpincludesposttemplatephp">branches/5.3/src/wp-includes/post-template.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches53">branches/5.3/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.3
</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/5.3 2022-08-30 15:35:38 UTC (rev 53969)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.3  2022-08-30 15:37:18 UTC (rev 53970)
</ins><a id="branches53"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.3</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:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</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:46583,46605-46606,46613,46616,46656,46658,46665,46668,46676-46677,46682,46700-46703,46705,46707,46709,46711,46713,46715,46719-46720,46722,46724,46738,46745-46748,46753,46756-46758,46761-46762,46765,46770,46772,46779,46782,46786,46788,46793,46795,46797,46809,46813,46815,46817,46822,46824,46832,46835,46837-46838,46840,46842,46844-46845,46849,46851-46852,46854,46856,46858,46860,46862,46864,46866,46868,46870,46872,46874,46883,46885,46887,46902,46965-46969,46973-46974,46976,46981,46996-46997,46999-47001,47010,47040,47070-47073,47136,47289,47313,47318,47341,47404,47412,47418,47633-47638,47730,47790,47867,47872-47873,47887,47889,47947-47951,48213,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49306,49335,49362,49369,49371,49380,49382-49388,49452,49548,49636,49779,49781-49784,49786,49836,49876,49933,49937-49940,49983,49989,50017,50126,50176,50185,50192,50267-50268
 ,50285,50298-50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598,50670,50704,50796,50799,50930,50940-50941,50984-50985,51341,51355,51426,51498,51511,51535,51559-51560,51740,51810-51813,51828,51883,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:46583,46605-46606,46613,46616,46656,46658,46665,46668,46676-46677,46682,46700-46703,46705,46707,46709,46711,46713,46715,46719-46720,46722,46724,46738,46745-46748,46753,46756-46758,46761-46762,46765,46770,46772,46779,46782,46786,46788,46793,46795,46797,46809,46813,46815,46817,46822,46824,46832,46835,46837-46838,46840,46842,46844-46845,46849,46851-46852,46854,46856,46858,46860,46862,46864,46866,46868,46870,46872,46874,46883,46885,46887,46902,46965-46969,46973-46974,46976,46981,46996-46997,46999-47001,47010,47040,47070-47073,47136,47289,47313,47318,47341,47404,47412,47418,47633-47638,47730,47790,47867,47872-47873,47887,47889,47947-47951,48213,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49306,49335,49362,49369,49371,49380,49382-49388,49452,49548,49636,49779,49781-49784,49786,49836,49876,49933,49937-49940,49983,49989,50017,50126,50176,50185,50192,50267-50268
 ,50285,50298-50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598,50670,50704,50796,50799,50930,50940-50941,50984-50985,51341,51355,51426,51498,51511,51535,51559-51560,51740,51810-51813,51828,51883,51921,51924-51925,51937,52002,52130,52183,52233,52412,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="branches53composerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/composer.json        2022-08-30 15:35:38 UTC (rev 53969)
+++ branches/5.3/composer.json  2022-08-30 15:37:18 UTC (rev 53970)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "phpunit/phpunit": "^5.7.21 || ^6.5 || ^7.5",
</span><span class="cx" style="display: block; padding: 0 10px">                "yoast/phpunit-polyfills": "^1.0.1"
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        "config": {
+               "allow-plugins": {
+                       "dealerdirect/phpcodesniffer-composer-installer": true
+               }
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         "scripts": {
</span><span class="cx" style="display: block; padding: 0 10px">                "compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",
</span><span class="cx" style="display: block; padding: 0 10px">                "format": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf --report=summary,source",
</span></span></pre></div>
<a id="branches53srcwpadminpluginsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-admin/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-admin/plugins.php     2022-08-30 15:35:38 UTC (rev 53969)
+++ branches/5.3/src/wp-admin/plugins.php       2022-08-30 15:37:18 UTC (rev 53970)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +488,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 deactivated 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">                 );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,7 +548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Error message. */
</span><span class="cx" style="display: block; padding: 0 10px">                                        __( 'Plugin could not be deleted due to an error: %s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $delete_result->get_error_message()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 esc_html( $delete_result->get_error_message() )
</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">                        </p>
</span></span></pre></div>
<a id="branches53srcwpincludesbookmarkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/bookmark.php 2022-08-30 15:35:38 UTC (rev 53969)
+++ branches/5.3/src/wp-includes/bookmark.php   2022-08-30 15:37:18 UTC (rev 53970)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,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 ( $parsed_args['limit'] != -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query .= ' LIMIT ' . $parsed_args['limit'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $query .= ' LIMIT ' . absint( $parsed_args['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="branches53srcwpincludesposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/post-template.php    2022-08-30 15:35:38 UTC (rev 53969)
+++ branches/5.3/src/wp-includes/post-template.php      2022-08-30 15:37:18 UTC (rev 53970)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,9 +1081,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">         $keys = get_post_custom_keys();
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $keys ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $li_html = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,8 +1100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                "<li><span class='post-meta-key'>%s</span> %s</li>\n",
</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: Post custom field name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                sprintf( _x( '%s:', 'Post custom field name' ), $key ),
-                               $value
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         esc_html( sprintf( _x( '%s:', 'Post custom field name' ), $key ) ),
+                               esc_html( $value )
</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>