<!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>[56377] trunk/src/wp-includes/kses.php: Coding Standards: Use strict comparison in `wp-includes/kses.php`.</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/56377">56377</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/56377","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>2023-08-09 10:59:04 +0000 (Wed, 09 Aug 2023)</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'>Coding Standards: Use strict comparison in `wp-includes/kses.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/649">[649]</a>, <a href="https://core.trac.wordpress.org/changeset/2896">[2896]</a>, <a href="https://core.trac.wordpress.org/changeset/3418">[3418]</a>, <a href="https://core.trac.wordpress.org/changeset/8386">[8386]</a>, <a href="https://core.trac.wordpress.org/changeset/20540">[20540]</a>, <a href="https://core.trac.wordpress.org/changeset/47219">[47219]</a>, <a href="https://core.trac.wordpress.org/changeset/54933">[54933]</a>.
Props aristath, poena, afercia, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/58831">#58831</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2023-08-08 22:59:52 UTC (rev 56376)
+++ trunk/src/wp-includes/kses.php 2023-08-09 10:59:04 UTC (rev 56377)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,16 +1088,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow HTML comments.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $content, '<!--' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( array( '<!--', '-->' ), '', $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( ( $newstring = wp_kses( $content, $allowed_html, $allowed_protocols ) ) != $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ while ( ( $newstring = wp_kses( $content, $allowed_html, $allowed_protocols ) ) !== $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = $newstring;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prevent multiple dashes in comments.
</span><span class="cx" style="display: block; padding: 0 10px"> $content = preg_replace( '/--+/', '-', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent three dashes closing a comment.
</span><span class="cx" style="display: block; padding: 0 10px"> $content = preg_replace( '/-$/', '', $content );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return "<!--{$content}-->";
</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">@@ -1357,6 +1361,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^\s+/', $attr ) ) { // Valueless.
</span><span class="cx" style="display: block; padding: 0 10px"> $working = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === array_key_exists( $attrname, $attrarr ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attrarr[ $attrname ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $attrname,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1365,6 +1370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'vless' => 'y',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr = preg_replace( '/^\s+/', '', $attr );
</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">@@ -1386,6 +1392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'vless' => 'n',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $working = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = preg_replace( '/^"[^"]*"(\s+|$)/', '', $attr );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,6 +1414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'vless' => 'n',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $working = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = preg_replace( "/^'[^']*'(\s+|$)/", '', $attr );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,6 +1436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'vless' => 'n',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We add quotes to conform to W3C's HTML spec.
</span><span class="cx" style="display: block; padding: 0 10px"> $working = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,13 +1446,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> } // End switch.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $working ) { // Not well-formed, remove and try again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $working ) { // Not well-formed, remove and try again.
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr = wp_kses_html_error( $attr );
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // End while.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $mode && false === array_key_exists( $attrname, $attrarr ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $mode && false === array_key_exists( $attrname, $attrarr ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Special case, for when the attribute list ends with a valueless
</span><span class="cx" style="display: block; padding: 0 10px"> * attribute like "selected".
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1707,9 +1716,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_content = $content;
</span><span class="cx" style="display: block; padding: 0 10px"> $content = wp_kses_bad_protocol_once( $content, $allowed_protocols );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } while ( $original_content != $content && ++$iterations < 6 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } while ( $original_content !== $content && ++$iterations < 6 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $original_content != $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $original_content !== $content ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1974,6 +1983,7 @@
</span><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"> $i = $matches[1];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( valid_unicode( $i ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $i = str_pad( ltrim( $i, '0' ), 3, '0', STR_PAD_LEFT );
</span><span class="cx" style="display: block; padding: 0 10px"> $i = "&#$i;";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2003,6 +2013,7 @@
</span><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"> $hexchars = $matches[1];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&#x$hexchars;" : '&#x' . ltrim( $hexchars, '0' ) . ';';
</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">@@ -2015,10 +2026,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether or not the codepoint is a valid Unicode codepoint.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function valid_unicode( $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( 0x9 == $i || 0xa == $i || 0xd == $i ||
- ( 0x20 <= $i && $i <= 0xd7ff ) ||
- ( 0xe000 <= $i && $i <= 0xfffd ) ||
- ( 0x10000 <= $i && $i <= 0x10ffff ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = (int) $i;
+
+ return ( 0x9 === $i || 0xa === $i || 0xd === $i ||
+ ( 0x20 <= $i && $i <= 0xd7ff ) ||
+ ( 0xe000 <= $i && $i <= 0xfffd ) ||
+ ( 0x10000 <= $i && $i <= 0x10ffff )
+ );
</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>