<!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>[52474] branches/4.9/src/wp-includes: Grouped backports to the 4.9 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/52474">52474</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/52474","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:14:19 +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.9 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.9 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadminincludesupgradephp">branches/4.9/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#branches49srcwpincludesclasswpmetaqueryphp">branches/4.9/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#branches49srcwpincludesclasswptaxqueryphp">branches/4.9/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#branches49srcwpincludesformattingphp">branches/4.9/src/wp-includes/formatting.php</a></li>
<li><a href="#branches49srcwpincludespostphp">branches/4.9/src/wp-includes/post.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</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.9 2022-01-06 18:13:41 UTC (rev 52473)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9  2022-01-06 18:14:19 UTC (rev 52474)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</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:42204
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43684-43686,43807,43836,43853,43988,43994,44014,44017,44047,45005,49523
</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:42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459-42463,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42676,42687,42695,42697,42702,42711,42713,42719,42722,42726,42728,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42887-42889,42892
 -42894,42930,42964,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290-43293,43299,43303-43304,43313,43315,43317,43320,43323,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,
 43495,43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43567,43580,43593,43597,43599,43609,43636,43638,43653,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,46682,46893,46895,46996,46999,47225,47341,47404,47633-47635,47637-47638,47867-47869,47872-47873,47912,47949-47951,48121,48241,48338,48341,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,50192,50268,50285,50298,50379,50387,50413,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:42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459-42463,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42676,42687,42695,42697,42702,42711,42713,42719,42722,42726,42728,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42887-42889,42892
 -42894,42930,42964,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290-43293,43299,43303-43304,43313,43315,43317,43320,43323,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,
 43495,43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43567,43580,43593,43597,43599,43609,43636,43638,43653,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,46682,46893,46895,46996,46999,47225,47341,47404,47633-47635,47637-47638,47867-47869,47872-47873,47912,47949-47951,48121,48241,48338,48341,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,50192,50268,50285,50298,50379,50387,50413,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="branches49srcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/upgrade.php    2022-01-06 18:13:41 UTC (rev 52473)
+++ branches/4.9/src/wp-admin/includes/upgrade.php      2022-01-06 18:14:19 UTC (rev 52474)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,8 +1297,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="branches49srcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/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.9/src/wp-includes/class-wp-meta-query.php      2022-01-06 18:13:41 UTC (rev 52473)
+++ branches/4.9/src/wp-includes/class-wp-meta-query.php        2022-01-06 18:14:19 UTC (rev 52474)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,7 +695,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="branches49srcwpincludesclasswptaxqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/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.9/src/wp-includes/class-wp-tax-query.php       2022-01-06 18:13:41 UTC (rev 52473)
+++ branches/4.9/src/wp-includes/class-wp-tax-query.php 2022-01-06 18:14:19 UTC (rev 52474)
</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="branches49srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/formatting.php       2022-01-06 18:13:41 UTC (rev 52473)
+++ branches/4.9/src/wp-includes/formatting.php 2022-01-06 18:14:19 UTC (rev 52474)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,12 +1084,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">@@ -1104,11 +1106,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="branches49srcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/post.php     2022-01-06 18:13:41 UTC (rev 52473)
+++ branches/4.9/src/wp-includes/post.php       2022-01-06 18:14:19 UTC (rev 52474)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3985,7 +3985,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>