<!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>[28716] trunk: Ensure that `shortcode_unautop()` treats ` ` like whitespace.</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/28716">28716</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-10 01:54:11 +0000 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that `shortcode_unautop()` treats ` ` like whitespace.
`shortcode_unautop()` and `wptexturize()` now use `wp_spaces_regexp()` instead of raw regex.
Adds unit tests.
Props miqrogroove.
See <a href="http://core.trac.wordpress.org/ticket/27588">#27588</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.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 (28715 => 28716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-10 01:45:28 UTC (rev 28715)
+++ trunk/src/wp-includes/formatting.php 2014-06-10 01:54:11 UTC (rev 28716)
</span><span class="lines">@@ -82,14 +82,7 @@
</span><span class="cx"> $static_characters = array_merge( array( '---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
</span><span class="cx"> $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
</span><span class="cx">
</span><del>- /*
- * Regex for common whitespace characters.
- *
- * By default, spaces include new lines, tabs, nbsp entities, and the UTF-8 nbsp.
- * This is designed to replace the PCRE \s sequence. In #WP22692, that sequence
- * was found to be unreliable due to random inclusion of the A0 byte.
- */
- $spaces = '[\r\n\t ]|\xC2\xA0| ';
</del><ins>+ $spaces = wp_spaces_regexp();
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // Pattern-based replacements of characters.
</span><span class="lines">@@ -370,11 +363,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
</span><ins>+ $spaces = wp_spaces_regexp();
</ins><span class="cx">
</span><span class="cx"> $pattern =
</span><span class="cx"> '/'
</span><span class="cx"> . '<p>' // Opening paragraph
</span><del>- . '\\s*+' // Optional leading whitespace
</del><ins>+ . '(?:' . $spaces . ')*+' // Optional leading whitespace
</ins><span class="cx"> . '(' // 1: The shortcode
</span><span class="cx"> . '\\[' // Opening bracket
</span><span class="cx"> . "($tagregexp)" // 2: Shortcode name
</span><span class="lines">@@ -399,7 +393,7 @@
</span><span class="cx"> . ')?'
</span><span class="cx"> . ')'
</span><span class="cx"> . ')'
</span><del>- . '\\s*+' // optional trailing whitespace
</del><ins>+ . '(?:' . $spaces . ')*+' // optional trailing whitespace
</ins><span class="cx"> . '<\\/p>' // closing paragraph
</span><span class="cx"> . '/s';
</span><span class="cx">
</span><span class="lines">@@ -3857,8 +3851,19 @@
</span><span class="cx"> static $spaces;
</span><span class="cx">
</span><span class="cx"> if ( empty( $spaces ) ) {
</span><ins>+ /**
+ * Regexp for common whitespace characters.
+ *
+ * This string is substituted for the \s sequence as needed in regular expressions.
+ * For websites not written in English, different characters may represent whitespace.
+ * For websites not encoded in UTF-8, the 0xC2 0xA0 sequence may not be in use.
+ *
+ * @since 4.0.0
+ *
+ * @param string $spaces
+ */
</ins><span class="cx"> $spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0| ' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $spaces;
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsshortcodephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/shortcode.php (28715 => 28716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/shortcode.php 2014-06-10 01:45:28 UTC (rev 28715)
+++ trunk/tests/phpunit/tests/shortcode.php 2014-06-10 01:54:11 UTC (rev 28716)
</span><span class="lines">@@ -373,4 +373,25 @@
</span><span class="cx"> remove_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts2' ), 10, 3 );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Check that shortcode_unautop() will always recognize spaces around shortcodes.
+ *
+ * @ticket 22692
+ */
+ function test_spaces_around_shortcodes() {
+ $nbsp = "\xC2\xA0";
+
+ $input = array();
+
+ $input[] = "<p>[gallery ids=\"37,15,11\"]</p>";
+ $input[] = "<p> [gallery ids=\"37,15,11\"] </p>";
+ $input[] = "<p> {$nbsp}[gallery ids=\"37,15,11\"] {$nbsp}</p>";
+ $input[] = "<p> [gallery ids=\"37,15,11\"] </p>";
+
+ $output = "[gallery ids=\"37,15,11\"]";
+
+ foreach($input as $in) {
+ $this->assertEquals( $output, shortcode_unautop( $in ) );
+ }
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>