<!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>[52469] branches/5.4/src/wp-includes: Grouped backports to the 5.4 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/52469">52469</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/52469","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-01-06 18:09:54 +0000 (Thu, 06 Jan 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.4 branch.

- Query: Improve sanitization within `WP_Tax_Query`.
- Query: Improve sanitization within `WP_Meta_Query`.
- Upgrade/Install: Avoid using `unserialize()` unnecessarily.
- Formatting: Correctly encode ASCII characters in post slugs.

Merges [52454-52457] to the 5.4 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches54srcwpadminincludesupgradephp">branches/5.4/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#branches54srcwpincludesclasswpmetaqueryphp">branches/5.4/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#branches54srcwpincludesclasswptaxqueryphp">branches/5.4/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#branches54srcwpincludesformattingphp">branches/5.4/src/wp-includes/formatting.php</a></li>
<li><a href="#branches54srcwpincludespostphp">branches/5.4/src/wp-includes/post.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches54">branches/5.4/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.4
</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.4 2022-01-06 18:09:14 UTC (rev 52468)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.4  2022-01-06 18:09:54 UTC (rev 52469)
</ins><a id="branches54"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.4</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:47432,47436,47439,47441,47443-47444,47449,47455-47456,47458-47459,47462,47475-47476,47495,47500,47502,47511,47513,47515,47517,47521,47532,47536-47537,47539,47547,47549,47555,47558,47560,47564,47568,47576,47578,47580,47586,47590-47591,47594,47608-47609,47628,47633-47635,47637-47638,47663-47664,47689,47699,47730,47734,47751,47784,47790,47795-47796,47799,47801,47820,47832,47838,47842,47846,47867,47872-47873,47889,47947-47952,47984,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,50717,50799,50940-50941,50984-50985,51426,51559-51560,51740,51810
 -51813,51828,51883
</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:47432,47436,47439,47441,47443-47444,47449,47455-47456,47458-47459,47462,47475-47476,47495,47500,47502,47511,47513,47515,47517,47521,47532,47536-47537,47539,47547,47549,47555,47558,47560,47564,47568,47576,47578,47580,47586,47590-47591,47594,47608-47609,47628,47633-47635,47637-47638,47663-47664,47689,47699,47730,47734,47751,47784,47790,47795-47796,47799,47801,47820,47832,47838,47842,47846,47867,47872-47873,47889,47947-47952,47984,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,50717,50799,50940-50941,50984-50985,51426,51559-51560,51740,51810
 -51813,51828,51883,52454-52457
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches54srcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-admin/includes/upgrade.php    2022-01-06 18:09:14 UTC (rev 52468)
+++ branches/5.4/src/wp-admin/includes/upgrade.php      2022-01-06 18:09:54 UTC (rev 52469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1614,8 +1614,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $start = 0;
</span><span class="cx" style="display: block; padding: 0 10px">                while ( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $rows as $row ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $value = $row->option_value;
-                               if ( ! @unserialize( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $value = maybe_unserialize( $row->option_value );
+                               if ( $value === $row->option_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $value = stripslashes( $value );
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $value !== $row->option_value ) {
</span></span></pre></div>
<a id="branches54srcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/class-wp-meta-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/class-wp-meta-query.php      2022-01-06 18:09:14 UTC (rev 52468)
+++ branches/5.4/src/wp-includes/class-wp-meta-query.php        2022-01-06 18:09:54 UTC (rev 52469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,7 +812,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $clause_compare  = strtoupper( $clause['compare'] );
</span><span class="cx" style="display: block; padding: 0 10px">                        $sibling_compare = strtoupper( $sibling['compare'] );
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $alias = $sibling['alias'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 break;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="branches54srcwpincludesclasswptaxqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/class-wp-tax-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/class-wp-tax-query.php       2022-01-06 18:09:14 UTC (rev 52468)
+++ branches/5.4/src/wp-includes/class-wp-tax-query.php 2022-01-06 18:09:54 UTC (rev 52469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // The sibling must both have compatible operator to share its alias.
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $alias = $sibling['alias'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 break;
</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">@@ -556,7 +556,11 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query['terms'] = array_unique( (array) $query['terms'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'slug' === $query['field'] || 'name' === $query['field'] ) {
+                       $query['terms'] = array_unique( (array) $query['terms'] );
+               } else {
+                       $query['terms'] = wp_parse_id_list( $query['terms'] );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->transform_query( $query, 'term_id' );
</span></span></pre></div>
<a id="branches54srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/formatting.php       2022-01-06 18:09:14 UTC (rev 52468)
+++ branches/5.4/src/wp-includes/formatting.php 2022-01-06 18:09:54 UTC (rev 52469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1157,12 +1157,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Encode the Unicode values to be used in the URI.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.3 Added the `encode_ascii_characters` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $utf8_string
- * @param int    $length Max  length of the string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $utf8_string             String to encode.
+ * @param int    $length                  Max length of the string
+ * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
</ins><span class="cx" style="display: block; padding: 0 10px">  * @return string String with Unicode encoded for URI.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function utf8_uri_encode( $utf8_string, $length = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px">         $unicode        = '';
</span><span class="cx" style="display: block; padding: 0 10px">        $values         = array();
</span><span class="cx" style="display: block; padding: 0 10px">        $num_octets     = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,11 +1179,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $value = ord( $utf8_string[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $value < 128 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $length && ( $unicode_length >= $length ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $char                = chr( $value );
+                       $encoded_char        = $encode_ascii_characters ? rawurlencode( $char ) : $char;
+                       $encoded_char_length = strlen( $encoded_char );
+                       if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 break;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $unicode .= chr( $value );
-                       $unicode_length++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $unicode        .= $encoded_char;
+                       $unicode_length += $encoded_char_length;
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( count( $values ) == 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $value < 224 ) {
</span></span></pre></div>
<a id="branches54srcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/post.php     2022-01-06 18:09:14 UTC (rev 52468)
+++ branches/5.4/src/wp-includes/post.php       2022-01-06 18:09:54 UTC (rev 52469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4509,7 +4509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $decoded_slug === $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $slug = substr( $slug, 0, $length );
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $slug = utf8_uri_encode( $decoded_slug, $length );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $slug = utf8_uri_encode( $decoded_slug, $length, true );
</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>