<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13648] trunk/wp-includes/kses.php: Fix numeric entity logic in kses.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13648">13648</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-10 18:45:28 +0000 (Wed, 10 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix numeric entity logic in kses. Props miqrogroove. see <a href="http://trac.wordpress.org/ticket/12284">#12284</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (13647 => 13648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2010-03-10 18:37:03 UTC (rev 13647)
+++ trunk/wp-includes/kses.php 2010-03-10 18:45:28 UTC (rev 13648)
</span><span class="lines">@@ -996,8 +996,8 @@
</span><span class="cx"> # Change back the allowed entities in our entity whitelist
</span><span class="cx">
</span><span class="cx"> $string = preg_replace_callback('/&amp;([A-Za-z]{2,8});/', 'wp_kses_named_entities', $string);
</span><del>- $string = preg_replace_callback('/&amp;#0*([0-9]{1,5});/', 'wp_kses_normalize_entities2', $string);
- $string = preg_replace_callback('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', 'wp_kses_normalize_entities3', $string);
</del><ins>+ $string = preg_replace_callback('/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);
+ $string = preg_replace_callback('/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string);
</ins><span class="cx">
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span><span class="lines">@@ -1040,7 +1040,14 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> $i = $matches[1];
</span><del>- return ( ( ! valid_unicode($i) ) || ($i > 65535) ? "&amp;#$i;" : "&#$i;" );
</del><ins>+ if (valid_unicode($i)) {
+ $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+ $i = "&#$i;";
+ } else {
+ $i = "&amp;#$i;";
+ }
+
+ return $i;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1055,11 +1062,11 @@
</span><span class="cx"> * @return string Correctly encoded entity
</span><span class="cx"> */
</span><span class="cx"> function wp_kses_normalize_entities3($matches) {
</span><del>- if ( empty($matches[2]) )
</del><ins>+ if ( empty($matches[1]) )
</ins><span class="cx"> return '';
</span><span class="cx">
</span><del>- $hexchars = $matches[2];
- return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : "&#x$hexchars;" );
</del><ins>+ $hexchars = $matches[1];
+ return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>