<!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>[28727] trunk: In `wptexturize()`, ensure that texturization does not corrupt contents of HTML elements, HTML comments, and smartcode attributes.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28727">28727</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-10 14:33:16 +0000 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `wptexturize()`, ensure that texturization does not corrupt contents of HTML elements, HTML comments, and smartcode attributes.
Adds a variety of unit tests/assertions.
Props miqrogroove.
Fixes <a href="http://core.trac.wordpress.org/ticket/12690">#12690</a>, <a href="http://core.trac.wordpress.org/ticket/8912">#8912</a>, <a href="http://core.trac.wordpress.org/ticket/27602">#27602</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (28726 => 28727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-10 14:21:36 UTC (rev 28726)
+++ trunk/src/wp-includes/formatting.php 2014-06-10 14:33:16 UTC (rev 28727)
</span><span class="lines">@@ -158,6 +158,11 @@
</span><span class="cx"> $dynamic_replacements = array_values( $dynamic );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If there's nothing to do, just stop.
+ if ( empty( $text ) ) {
+ return $text;
+ }
+
</ins><span class="cx"> // Transform into regexp sub-expression used in _wptexturize_pushpop_element
</span><span class="cx"> // Must do this every time in case plugins use these filters in a context sensitive manner
</span><span class="cx"> /**
</span><span class="lines">@@ -180,25 +185,50 @@
</span><span class="cx"> $no_texturize_tags_stack = array();
</span><span class="cx"> $no_texturize_shortcodes_stack = array();
</span><span class="cx">
</span><del>- $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
</del><ins>+ // Look for shortcodes and HTML elements.
</ins><span class="cx">
</span><ins>+ $regex = '/(' // Capture the entire match.
+ . '<' // Find start of element.
+ . '(?(?=!--)' // Is this a comment?
+ . '.+?--\s*>' // Find end of comment
+ . '|'
+ . '.+?>' // Find end of element
+ . ')'
+ . '|'
+ . '\[' // Find start of shortcode.
+ . '\[?' // Shortcodes may begin with [[
+ . '[^\[\]<>]+' // Shortcodes do not contain other shortcodes or HTML elements.
+ . '\]' // Find end of shortcode.
+ . '\]?' // Shortcodes may end with ]]
+ . ')/s';
+
+ $textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+
</ins><span class="cx"> foreach ( $textarr as &$curl ) {
</span><del>- if ( empty( $curl ) ) {
- continue;
- }
</del><ins>+ // Only call _wptexturize_pushpop_element if $curl is a delimeter.
+ $first = $curl[0];
+ if ( '<' === $first && '>' === substr( $curl, -1 ) ) {
+ // This is an HTML delimeter.
</ins><span class="cx">
</span><del>- // Only call _wptexturize_pushpop_element if first char is correct tag opening
- $first = $curl[0];
- if ( '<' === $first ) {
- _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
- } elseif ( '[' === $first ) {
- _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
</del><ins>+ if ( '<!--' !== substr( $curl, 0, 4 ) ) {
+ _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>' );
+ }
+
+ } elseif ( '[' === $first && 1 === preg_match( '/^\[[^\[\]<>]+\]$/', $curl ) ) {
+ // This is a shortcode delimeter.
+
+ _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']' );
+
+ } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?[^\[\]<>]+\]\]?$/', $curl ) ) {
+ // This is an escaped shortcode delimeter.
+
+ // Do not texturize.
+ // Do not push to the shortcodes stack.
+
</ins><span class="cx"> } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
</span><ins>+ // This is neither a delimeter, nor is this content inside of no_texturize pairs. Do texturize.
</ins><span class="cx">
</span><del>- // This is not a tag, nor is the texturization disabled static strings
</del><span class="cx"> $curl = str_replace($static_characters, $static_replacements, $curl);
</span><del>-
- // regular expressions
</del><span class="cx"> $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
</span><span class="cx">
</span><span class="cx"> // 9x9 (times), but never 0x9999
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php (28726 => 28727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-10 14:21:36 UTC (rev 28726)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-10 14:33:16 UTC (rev 28727)
</span><span class="lines">@@ -1128,4 +1128,155 @@
</span><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Test HTML and shortcode avoidance.
+ *
+ * @ticket 12690
+ * @dataProvider data_tag_avoidance
+ */
+ function test_tag_avoidance( $input, $output ) {
+ return $this->assertEquals( $output, wptexturize( $input ) );
+ }
+
+ function data_tag_avoidance() {
+ return array(
+ array(
+ '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a> ]',
+ '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a> ]',
+ ),
+ array(
+ '[gallery ...]',
+ '[gallery ...]',
+ ),
+ array(
+ '[[gallery ...]', // This tag is still valid.
+ '[[gallery ...]',
+ ),
+ array(
+ '[gallery ...]]', // This tag is also valid.
+ '[gallery ...]]',
+ ),
+ array(
+ '[/...]', // This would actually be ignored by the shortcode system. The decision to not texturize it is intentional, if not correct.
+ '[/...]',
+ ),
+ array(
+ '[...]...[/...]', // These are potentially usable shortcodes.
+ '[...]…[/...]',
+ ),
+ array(
+ '[[...]]...[[/...]]', // Shortcode parsing will ignore the inner ]...[ part and treat this as a single escaped shortcode.
+ '[[...]]…[[/...]]',
+ ),
+ array(
+ '[[[...]]]...[[[/...]]]', // Again, shortcode parsing matches, but only the [[...] and [/...]] parts.
+ '[[[...]]]…[[[/...]]]',
+ ),
+ array(
+ '[[code]...[/code]...', // These are potentially usable shortcodes. Unfortunately, the meaning of [[/code] is ambiguous unless we run the entire shortcode regexp.
+ '[[code]…[/code]...', // Same behavior as 3.9 due to buggy logic in _wptexturize_pushpop_element(). See ticket #28483.
+ ),
+ array(
+ '[code]...[/code]]...', // These are potentially usable shortcodes. Unfortunately, the meaning of [/code]] is ambiguous unless we run the entire shortcode regexp.
+ '[code]...[/code]]...', // This test would not pass in 3.9 because the extra brace was always ignored by texturize.
+ ),
+ array(
+ '[gal>ery ...]',
+ '[gal>ery …]',
+ ),
+ array(
+ '[gallery ...',
+ '[gallery …',
+ ),
+ array(
+ '[gallery <br ... /> ...]',
+ '[gallery <br ... /> …]',
+ ),
+ array(
+ '<br [gallery ...] ... />',
+ '<br [gallery ...] ... />',
+ ),
+ array(
+ '<br [gallery ...] ... /',
+ '<br [gallery ...] … /',
+ ),
+ array(
+ '<br ... />',
+ '<br ... />',
+ ),
+ array(
+ '<br ... />...<br ... />',
+ '<br ... />…<br ... />',
+ ),
+ array(
+ '[gallery ...]...[gallery ...]',
+ '[gallery ...]…[gallery ...]',
+ ),
+ array(
+ '[[gallery ...]]',
+ '[[gallery ...]]',
+ ),
+ array(
+ '[[gallery ...]',
+ '[[gallery ...]',
+ ),
+ array(
+ '[gallery ...]]',
+ '[gallery ...]]',
+ ),
+ array(
+ '[/gallery ...]]',
+ '[/gallery ...]]',
+ ),
+ array(
+ '[[gallery <br ... /> ...]]',
+ '[[gallery <br ... /> …]]',
+ ),
+ array(
+ '<br [[gallery ...]] ... />',
+ '<br [[gallery ...]] ... />',
+ ),
+ array(
+ '<br [[gallery ...]] ... /',
+ '<br [[gallery ...]] … /',
+ ),
+ array(
+ '[[gallery ...]]...[[gallery ...]]',
+ '[[gallery ...]]…[[gallery ...]]',
+ ),
+ array(
+ '[[gallery ...]...[/gallery]]',
+ '[[gallery ...]…[/gallery]]',
+ ),
+ array(
+ '<!-- ... -->',
+ '<!-- ... -->',
+ ),
+ array(
+ '<!--...-->',
+ '<!--...-->',
+ ),
+ array(
+ '<!-- ... -- >',
+ '<!-- ... -- >',
+ ),
+ array(
+ '<!-- <br /> [gallery] ... -->',
+ '<!-- <br /> [gallery] ... -->',
+ ),
+ array(
+ '...<!-- ... -->...',
+ '…<!-- ... -->…',
+ ),
+ array(
+ '[gallery ...]...<!-- ... -->...<br ... />',
+ '[gallery ...]…<!-- ... -->…<br ... />',
+ ),
+ array(
+ '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>',
+ '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>',
+ ),
+ );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>