<!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>[52479] branches/4.4/src/wp-includes: Grouped backports to the 4.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/52479">52479</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/52479","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:18:04 +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 4.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 4.4 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches44srcwpadminincludesupgradephp">branches/4.4/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#branches44srcwpincludesclasswpmetaqueryphp">branches/4.4/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#branches44srcwpincludesclasswptaxqueryphp">branches/4.4/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#branches44srcwpincludesformattingphp">branches/4.4/src/wp-includes/formatting.php</a></li>
<li><a href="#branches44srcwpincludespostphp">branches/4.4/src/wp-includes/post.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches44">branches/4.4/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.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/4.4 2022-01-06 18:17:02 UTC (rev 52478)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.4 2022-01-06 18:18:04 UTC (rev 52479)
</ins><a id="branches44"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.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: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:35802,35823,35825-35826,35829,35832-35834,35837,35839,35850,35859,35862,35876,35880,35897,35922,35931,35933,35943-35944,35978,35994,36003,36005,36007,36038,36040,36042,36045,36048,36056,36068,36081,36089,36094,36096-36097,36100,36108,36110,36117,36119-36121,36123,36130,36132,36134,36137,36141,36154,36157,36163,36168,36226,36249,36251,36258,36260-36261,36275-36277,36323-36324,36326,36359,36368,36411,36429,36435,36860-36865,36935,36978-36979,36989,37017,37019-37020,37058,37124,37145,37150,37212,37340,37612,37651,37697,37720,37730,38111,38524,38688,38757,39110,39113-39119,39360-39361,39478,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40255,40257-40259,40269,40271,40400,40538,40604,40677,40692,40704,40716,40723,40736,40851-40852,41072,41393,41395,41397-41398,41448,41457,41470,41483,41496,41522,41662,41712,41870,41920,42056,42119
-42120,42258-42261,42424,42433,42460-42461,42463,42887,42892-42893,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,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,50799
</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:35802,35823,35825-35826,35829,35832-35834,35837,35839,35850,35859,35862,35876,35880,35897,35922,35931,35933,35943-35944,35978,35994,36003,36005,36007,36038,36040,36042,36045,36048,36056,36068,36081,36089,36094,36096-36097,36100,36108,36110,36117,36119-36121,36123,36130,36132,36134,36137,36141,36154,36157,36163,36168,36226,36249,36251,36258,36260-36261,36275-36277,36323-36324,36326,36359,36368,36411,36429,36435,36860-36865,36935,36978-36979,36989,37017,37019-37020,37058,37124,37145,37150,37212,37340,37612,37651,37697,37720,37730,38111,38524,38688,38757,39110,39113-39119,39360-39361,39478,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40255,40257-40259,40269,40271,40400,40538,40604,40677,40692,40704,40716,40723,40736,40851-40852,41072,41393,41395,41397-41398,41448,41457,41470,41483,41496,41522,41662,41712,41870,41920,42056,42119
-42120,42258-42261,42424,42433,42460-42461,42463,42887,42892-42893,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,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,50799,52454-52457
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches44srcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-admin/includes/upgrade.php 2022-01-06 18:17:02 UTC (rev 52478)
+++ branches/4.4/src/wp-admin/includes/upgrade.php 2022-01-06 18:18:04 UTC (rev 52479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1216,8 +1216,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"> if ( $value !== $row->option_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $row->option_name, $value );
</span></span></pre></div>
<a id="branches44srcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.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/4.4/src/wp-includes/class-wp-meta-query.php 2022-01-06 18:17:02 UTC (rev 52478)
+++ branches/4.4/src/wp-includes/class-wp-meta-query.php 2022-01-06 18:18:04 UTC (rev 52479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,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="branches44srcwpincludesclasswptaxqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.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/4.4/src/wp-includes/class-wp-tax-query.php 2022-01-06 18:17:02 UTC (rev 52478)
+++ branches/4.4/src/wp-includes/class-wp-tax-query.php 2022-01-06 18:18:04 UTC (rev 52479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +543,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">@@ -573,7 +573,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="branches44srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-includes/formatting.php 2022-01-06 18:17:02 UTC (rev 52478)
+++ branches/4.4/src/wp-includes/formatting.php 2022-01-06 18:18:04 UTC (rev 52479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,12 +1064,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">@@ -1084,11 +1086,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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4848,4 +4853,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #dashboard-widgets .hndle .postbox-title-action { float: right; line-height: 1.2; }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'admin_print_styles-index.php', '_wp_441_dashboard_display_configure_links_css' );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'admin_print_styles-index.php', '_wp_441_dashboard_display_configure_links_css' );
</ins></span></pre></div>
<a id="branches44srcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-includes/post.php 2022-01-06 18:17:02 UTC (rev 52478)
+++ branches/4.4/src/wp-includes/post.php 2022-01-06 18:18:04 UTC (rev 52479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3688,7 +3688,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"> return rtrim( $slug, '-' );
</span></span></pre>
</div>
</div>
</body>
</html>