<!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>[18485] trunk/wp-includes/formatting.php: Better double encoding handling in _wp_special_chars().</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18485">18485</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-07-29 20:43:45 +0000 (Fri, 29 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better double encoding handling in _wp_special_chars(). Props miqrogroove.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (18484 => 18485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-07-29 19:21:21 UTC (rev 18484)
+++ trunk/wp-includes/formatting.php 2011-07-29 20:43:45 UTC (rev 18485)
</span><span class="lines">@@ -294,34 +294,31 @@
</span><span class="cx"> function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
</span><span class="cx"> $string = (string) $string;
</span><span class="cx">
</span><del>- if ( 0 === strlen( $string ) ) {
</del><ins>+ if ( 0 === strlen( $string ) )
</ins><span class="cx"> return '';
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // Don't bother if there are no specialchars - saves some processing
</span><del>- if ( !preg_match( '/[&<>"\']/', $string ) ) {
</del><ins>+ if ( ! preg_match( '/[&<>"\']/', $string ) )
</ins><span class="cx"> return $string;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // Account for the previous behaviour of the function when the $quote_style is not an accepted value
</span><del>- if ( empty( $quote_style ) ) {
</del><ins>+ if ( empty( $quote_style ) )
</ins><span class="cx"> $quote_style = ENT_NOQUOTES;
</span><del>- } elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
</del><ins>+ elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
</ins><span class="cx"> $quote_style = ENT_QUOTES;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
</span><del>- if ( !$charset ) {
</del><ins>+ if ( ! $charset ) {
</ins><span class="cx"> static $_charset;
</span><del>- if ( !isset( $_charset ) ) {
</del><ins>+ if ( ! isset( $_charset ) ) {
</ins><span class="cx"> $alloptions = wp_load_alloptions();
</span><span class="cx"> $_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
</span><span class="cx"> }
</span><span class="cx"> $charset = $_charset;
</span><span class="cx"> }
</span><del>- if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
</del><ins>+
+ if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
</ins><span class="cx"> $charset = 'UTF-8';
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $_quote_style = $quote_style;
</span><span class="cx">
</span><span class="lines">@@ -333,28 +330,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Handle double encoding ourselves
</span><del>- if ( !$double_encode ) {
</del><ins>+ if ( $double_encode ) {
+ $string = @htmlspecialchars( $string, $quote_style, $charset );
+ } else {
+ // Decode &amp; into &
</ins><span class="cx"> $string = wp_specialchars_decode( $string, $_quote_style );
</span><span class="cx">
</span><del>- /* Critical */
- // The previous line decodes &amp;phrase; into &phrase; We must guarantee that &phrase; is valid before proceeding.
- $string = wp_kses_normalize_entities($string);
</del><ins>+ // Guarantee every &entity; is valid or re-encode the &
+ $string = wp_kses_normalize_entities( $string );
</ins><span class="cx">
</span><del>- // Now proceed with custom double-encoding silliness
- $string = preg_replace( '/&(#?x?[0-9a-z]+);/i', '|wp_entity|$1|/wp_entity|', $string );
- }
</del><ins>+ // Now re-encode everything except &entity;
+ $string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
</ins><span class="cx">
</span><del>- $string = @htmlspecialchars( $string, $quote_style, $charset );
</del><ins>+ for ( $i = 0; $i < count( $string ); $i += 2 )
+ $string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
</ins><span class="cx">
</span><del>- // Handle double encoding ourselves
- if ( !$double_encode ) {
- $string = str_replace( array( '|wp_entity|', '|/wp_entity|' ), array( '&', ';' ), $string );
</del><ins>+ $string = implode( '', $string );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Backwards compatibility
</span><del>- if ( 'single' === $_quote_style ) {
</del><ins>+ if ( 'single' === $_quote_style )
</ins><span class="cx"> $string = str_replace( "'", '&#039;', $string );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>