Ticket #22692: miqro-22692.15.patch

src/wp-includes/formatting.php

@@ -73 +73 @@
                 $static_characters = array_merge( array( '---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
                 $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
+                // Pattern-based replacements of characters.
                 $dynamic = array();
-                if ( "'" != $apos ) {
-                        $dynamic[ '/\'(\d\d(?:’|\')?s)/' ] = $apos . '$1'; // '99's
-                        $dynamic[ '/\'(\d)/'                   ] = $apos . '$1'; // '99
-                }
+                $spaces = wp_spaces_regexp();
+
+                // '99s (apostrophe)
+                if ( "'" != $apos )
+                        $dynamic[ '/\'(?=\d)/' ] = $apos;
+
+                // Single quote at start, or preceded by (, {, <, [, ", or spaces.
                 if ( "'" != $opening_single_quote )
-                        $dynamic[ '/(\s|\A|[([{<]|")\'/'       ] = '$1' . $opening_single_quote; // opening single quote, even after (, {, <, [
+                        $dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote;
+
+                // 9" (double prime)
                 if ( '"' != $double_prime )
-                        $dynamic[ '/(\d)"/'                    ] = '$1' . $double_prime; // 9" (double prime)
+                        $dynamic[ '/(?<=\d)"/' ] = $double_prime;
+
+                // 9' (prime)
                 if ( "'" != $prime )
-                        $dynamic[ '/(\d)\'/'                   ] = '$1' . $prime; // 9' (prime)
+                        $dynamic[ '/(?<=\d)\'/' ] = $prime;
+
+                // Apostrophe in a word.  No spaces or double primes.
                 if ( "'" != $apos )
-                        $dynamic[ '/(\S)\'([^\'\s])/'          ] = '$1' . $apos . '$2'; // apostrophe in a word
+                        $dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos;
+
+                // Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces.
                 if ( '"' != $opening_quote )
-                        $dynamic[ '/(\s|\A|[([{<])"(?!\s)/'    ] = '$1' . $opening_quote . '$2'; // opening double quote, even after (, {, <, [
+                        $dynamic[ '/(?<=\A|[([{<]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
+
+                // Any remaining double quotes.
                 if ( '"' != $closing_quote )
-                        $dynamic[ '/"(\s|\S|\Z)/'              ] = $closing_quote . '$1'; // closing double quote
+                        $dynamic[ '/"/' ] = $closing_quote;
+
+                // Single quotes followed by spaces or a period.
                 if ( "'" != $closing_single_quote )
-                        $dynamic[ '/\'([\s.]|\Z)/'             ] = $closing_single_quote . '$1'; // closing single quote
+                        $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote; 
 
-                $dynamic[ '/\b(\d+)x(\d+)\b/'              ] = '$1&#215;$2'; // 9x9 (times)
-
                 $dynamic_characters = array_keys( $dynamic );
                 $dynamic_replacements = array_values( $dynamic );
         }
@@ -134 +148 @@
                 } elseif ( '[' === $first ) {
                         _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
                 } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
+
                         // This is not a tag, nor is the texturization disabled static strings
                         $curl = str_replace($static_characters, $static_replacements, $curl);
+
                         // regular expressions
                         $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
+
+                        // 9x9 (times)
+                        if ( 1 === preg_match( '/(?<=\d)x\d/', $text ) ) {
+
+                                // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
+                                $curl = preg_replace('/\b(\d+)x(\d+)\b/', '$1&#215;$2', $curl);
+
+                        }
                 }
+
+                // Replace each & with &#038; unless it already looks like an entity.
                 $curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
         }
         return implode( '', $textarr );
@@ -318 +344 @@
         }
 
         $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+        $spaces = wp_spaces_regexp();
 
         $pattern =
                   '/'
                 . '<p>'                              // Opening paragraph
-                . '\\s*+'                            // Optional leading whitespace
+                . '(?:' . $spaces . ')*+'            // Optional leading whitespace
                 . '('                                // 1: The shortcode
                 .     '\\['                          // Opening bracket
                 .     "($tagregexp)"                 // 2: Shortcode name
@@ -347 +374 @@
                 .         ')?'
                 .     ')'
                 . ')'
-                . '\\s*+'                            // optional trailing whitespace
+                . '(?:' . $spaces . ')*+'            // optional trailing whitespace
                 . '<\\/p>'                           // closing paragraph
                 . '/s';
 
@@ -3782 +3809 @@
 
         return false;
 }
+
+/**
+ * Returns the regexp 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 ticket #22692, that
+ * sequence was found to be unreliable due to random inclusion of the A0 byte.
+ *
+ * @since 3.9.0
+ *
+ * @return string The spaces regexp.
+ */
+function wp_spaces_regexp() {
+        static $spaces;
+
+        if (empty($spaces)) {
+                $spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
+        }
+
+        return $spaces;
+}

tests/phpunit/tests/formatting/WPTexturize.php

@@ -14 +14 @@
                 $this->assertEquals('[a]a–b[code]---[/code]a–b[/a]', wptexturize('[a]a--b[code]---[/code]a--b[/a]'));
                 $this->assertEquals('<pre><code></code>--</pre>', wptexturize('<pre><code></code>--</pre>'));
 
-                $this->assertEquals('<code>---</code>', wptexturize('<code>---</code>'));
+                $this->assertEquals( '<code>---</code>',     wptexturize( '<code>---</code>'     ) );
+                $this->assertEquals( '<kbd>---</kbd>',       wptexturize( '<kbd>---</kbd>'       ) );
+                $this->assertEquals( '<style>---</style>',   wptexturize( '<style>---</style>'   ) );
+                $this->assertEquals( '<script>---</script>', wptexturize( '<script>---</script>' ) );
+                $this->assertEquals( '<tt>---</tt>',         wptexturize( '<tt>---</tt>'         ) );
 
                 $this->assertEquals('<code>href="baba"</code> &#8220;baba&#8221;', wptexturize('<code>href="baba"</code> "baba"'));
 
@@ -44 +48 @@
         //WP Ticket #4539
         function test_basic_quotes() {
                 $this->assertEquals('test&#8217;s', wptexturize('test\'s'));
-                $this->assertEquals('test&#8217;s', wptexturize('test\'s'));
 
                 $this->assertEquals('&#8216;quoted&#8217;', wptexturize('\'quoted\''));
                 $this->assertEquals('&#8220;quoted&#8221;', wptexturize('"quoted"'));
@@ -194 +197 @@
                 $this->assertEquals( ' &#8212;&nbsp;', wptexturize( ' --&nbsp;' ) );
                 $this->assertEquals( '&nbsp;&#8212; ', wptexturize( '&nbsp;-- ') );
         }
+
+        /**
+         * @ticket 22692
+         */
+        function test_spaces_around_quotes() {
+                $nbsp = "\xC2\xA0";
+                $pi   = "\xCE\xA0";
+
+                // This should never happen, even if the desired output changes some day.
+
+                $problem_input  = "$nbsp\"A";
+                $problem_output = "$nbsp&#8221;A";
+
+                $this->assertNotEquals( $problem_output, wptexturize( $problem_input ) );
+
+                // These are desirable outputs for the current design.
+
+                $input  = array();
+                $output = array();
+
+                $input[]  = "stop. $nbsp\"A quote after 2 spaces.\"";
+                $output[] = "stop. $nbsp&#8220;A quote after 2 spaces.&#8221;";
+
+                $input[]  = "stop.$nbsp$nbsp\"A quote after 2 spaces.\"";
+                $output[] = "stop.$nbsp$nbsp&#8220;A quote after 2 spaces.&#8221;";
+
+                $input[]  = "stop. $nbsp'A quote after 2 spaces.'";
+                $output[] = "stop. $nbsp&#8216;A quote after 2 spaces.&#8217;";
+
+                $input[]  = "stop.$nbsp$nbsp'A quote after 2 spaces.'";
+                $output[] = "stop.$nbsp$nbsp&#8216;A quote after 2 spaces.&#8217;";
+
+                $input[]  = "stop. &nbsp;\"A quote after 2 spaces.\"";
+                $output[] = "stop. &nbsp;&#8220;A quote after 2 spaces.&#8221;";
+
+                $input[]  = "stop.&nbsp;&nbsp;\"A quote after 2 spaces.\"";
+                $output[] = "stop.&nbsp;&nbsp;&#8220;A quote after 2 spaces.&#8221;";
+
+                $input[]  = "stop. &nbsp;'A quote after 2 spaces.'";
+                $output[] = "stop. &nbsp;&#8216;A quote after 2 spaces.&#8217;";
+
+                $input[]  = "stop.&nbsp;&nbsp;'A quote after 2 spaces.'";
+                $output[] = "stop.&nbsp;&nbsp;&#8216;A quote after 2 spaces.&#8217;";
+
+                $input[]  = "Contraction: $pi's";
+                $output[] = "Contraction: $pi&#8217;s";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_apos_before_digits() {
+                $input  = array();
+                $output = array();
+
+                // Apostrophe before a number always becomes &#8217 (apos);
+
+                $input[]  = "word '99 word";
+                $output[] = "word &#8217;99 word";
+
+                $input[]  = "word'99 word";
+                $output[] = "word&#8217;99 word";
+
+                $input[]  = "word '99word";
+                $output[] = "word &#8217;99word";
+
+                $input[]  = "word'99word";
+                $output[] = "word&#8217;99word";
+
+                $input[]  = "word '99&#8217;s word"; // Appears as a separate but logically superfluous pattern in 3.8.
+                $output[] = "word &#8217;99&#8217;s word";
+
+                $input[]  = "word '99's word"; // Due to the logic error, second apos becomes a prime.  See ticket #22823
+                $output[] = "word &#8217;99&#8242;s word";
+
+                $input[]  = "word '99'samsonite";
+                $output[] = "word &#8217;99&#8242;samsonite";
+
+                $input[]  = "according to our source, '33% of all students scored less than 50' on the test."; // Apostrophes and primes have priority over quotes
+                $output[] = "according to our source, &#8217;33% of all students scored less than 50&#8242; on the test.";
+
+                $input[]  = "word '99' word"; // See ticket #8775
+                $output[] = "word &#8217;99&#8242; word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_opening_single_quote() {
+                $input  = array();
+                $output = array();
+
+                // Apostrophe after a space or ([{<" becomes &#8216; (opening_single_quote)
+
+                $input[]  = "word 'word word";
+                $output[] = "word &#8216;word word";
+
+                $input[]  = "word ('word word";
+                $output[] = "word (&#8216;word word";
+
+                $input[]  = "word ['word word";
+                $output[] = "word [&#8216;word word";
+
+                $input[]  = "word <'word word"; // Invalid HTML input?
+                $output[] = "word <&#8216;word word";
+
+                $input[]  = "word &lt;'word word"; // Valid HTML input triggers the apos in a word pattern
+                $output[] = "word &lt;&#8217;word word";
+
+                $input[]  = "word {'word word";
+                $output[] = "word {&#8216;word word";
+
+                $input[]  = "word \"'word word";
+                $output[] = "word &#8220;&#8216;word word"; // Two opening quotes
+
+                $input[]  = "'word word";
+                $output[] = "&#8216;word word";
+
+                $input[]  = "word('word word";
+                $output[] = "word(&#8216;word word";
+
+                $input[]  = "word['word word";
+                $output[] = "word[&#8216;word word";
+
+                $input[]  = "word<'word word";
+                $output[] = "word<&#8216;word word";
+
+                $input[]  = "word&lt;'word word";
+                $output[] = "word&lt;&#8217;word word";
+
+                $input[]  = "word{'word word";
+                $output[] = "word{&#8216;word word";
+
+                $input[]  = "word\"'word word";
+                $output[] = "word&#8221;&#8216;word word"; // Closing quote, then opening quote
+
+                $input[]  = "word ' word word";
+                $output[] = "word &#8216; word word";
+
+                $input[]  = "word (' word word";
+                $output[] = "word (&#8216; word word";
+
+                $input[]  = "word [' word word";
+                $output[] = "word [&#8216; word word";
+
+                $input[]  = "word <' word word"; // Invalid HTML input?
+                $output[] = "word <&#8216; word word";
+
+                $input[]  = "word &lt;' word word"; // Valid HTML input triggers the closing single quote here
+                $output[] = "word &lt;&#8217; word word";
+
+                $input[]  = "word {' word word";
+                $output[] = "word {&#8216; word word";
+
+                $input[]  = "word \"' word word";
+                $output[] = "word &#8220;&#8216; word word"; // Two opening quotes
+
+                $input[]  = "' word word";
+                $output[] = "&#8216; word word";
+
+                $input[]  = "word(' word word";
+                $output[] = "word(&#8216; word word";
+
+                $input[]  = "word[' word word";
+                $output[] = "word[&#8216; word word";
+
+                $input[]  = "word<' word word";
+                $output[] = "word<&#8216; word word";
+
+                $input[]  = "word&lt;' word word";
+                $output[] = "word&lt;&#8217; word word";
+
+                $input[]  = "word{' word word";
+                $output[] = "word{&#8216; word word";
+
+                $input[]  = "word\"' word word";
+                $output[] = "word&#8221;&#8216; word word"; // Closing quote, then opening quote
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_double_prime() {
+                $input  = array();
+                $output = array();
+
+                // Double quote after a number becomes &#8243; (double_prime)
+
+                $input[]  = 'word 99" word';
+                $output[] = 'word 99&#8243; word';
+
+                $input[]  = 'word 99"word';
+                $output[] = 'word 99&#8243;word';
+
+                $input[]  = 'word99" word';
+                $output[] = 'word99&#8243; word';
+
+                $input[]  = 'word99"word';
+                $output[] = 'word99&#8243;word';
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_single_prime() {
+                $input  = array();
+                $output = array();
+
+                // Apostrophe after a number becomes &#8242; (prime)
+
+                $input[]  = "word 99' word";
+                $output[] = "word 99&#8242; word";
+
+                $input[]  = "word 99'word";
+                $output[] = "word 99&#8242;word";
+
+                $input[]  = "word99' word";
+                $output[] = "word99&#8242; word";
+
+                $input[]  = "word99'word";
+                $output[] = "word99&#8242;word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_contractions() {
+                $input  = array();
+                $output = array();
+
+                // Apostrophe "in a word" becomes &#8217; (apos)
+
+                $input[]  = "word word's word";
+                $output[] = "word word&#8217;s word";
+
+                $input[]  = "word word'. word"; // Quotes with outside punctuation could end with apostrophes instead of closing quotes (may affect i18n)
+                $output[] = "word word&#8217;. word";
+
+                $input[]  = "word ]'. word";
+                $output[] = "word ]&#8217;. word";
+
+                $input[]  = "word )'. word";
+                $output[] = "word )&#8217;. word";
+
+                $input[]  = "word }'. word";
+                $output[] = "word }&#8217;. word";
+
+                $input[]  = "word >'. word"; // Not tested
+                $output[] = "word >&#8217;. word";
+
+                $input[]  = "word &gt;'. word";
+                $output[] = "word &gt;&#8217;. word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_opening_quote() {
+                $input  = array();
+                $output = array();
+
+                // Double quote after a space or ([{< becomes &#8220; (opening_quote) if not followed by spaces
+
+                $input[]  = 'word "word word';
+                $output[] = 'word &#8220;word word';
+
+                $input[]  = 'word ("word word';
+                $output[] = 'word (&#8220;word word';
+
+                $input[]  = 'word ["word word';
+                $output[] = 'word [&#8220;word word';
+
+                $input[]  = 'word <"word word'; // Invalid HTML input?
+                $output[] = 'word <&#8220;word word';
+
+                $input[]  = 'word &lt;"word word'; // Valid HTML input triggers the closing quote pattern
+                $output[] = 'word &lt;&#8221;word word';
+
+                $input[]  = 'word {"word word';
+                $output[] = 'word {&#8220;word word';
+
+                $input[]  = '"word word';
+                $output[] = '&#8220;word word';
+
+                $input[]  = 'word("word word';
+                $output[] = 'word(&#8220;word word';
+
+                $input[]  = 'word["word word';
+                $output[] = 'word[&#8220;word word';
+
+                $input[]  = 'word<"word word'; // Invalid HTML input?
+                $output[] = 'word<&#8220;word word';
+
+                $input[]  = 'word&lt;"word word'; // Valid HTML input triggers the closing quote pattern
+                $output[] = 'word&lt;&#8221;word word';
+
+                $input[]  = 'word{"word word';
+                $output[] = 'word{&#8220;word word';
+
+                $input[]  = 'word "99 word';
+                $output[] = 'word &#8220;99 word';
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_closing_quote() {
+                $input  = array();
+                $output = array();
+
+                // Double quote becomes &#8221; (closing_quote) unless it is already converted to double_prime or opening_quote.
+
+                $input[]  = 'word word" word';
+                $output[] = 'word word&#8221; word';
+
+                $input[]  = 'word word") word';
+                $output[] = 'word word&#8221;) word';
+
+                $input[]  = 'word word"] word';
+                $output[] = 'word word&#8221;] word';
+
+                $input[]  = 'word word"} word';
+                $output[] = 'word word&#8221;} word';
+
+                $input[]  = 'word word"> word'; // Invalid HTML input?
+                $output[] = 'word word&#8221;> word';
+
+                $input[]  = 'word word"&gt; word'; // Valid HTML should work
+                $output[] = 'word word&#8221;&gt; word';
+
+                $input[]  = 'word word"';
+                $output[] = 'word word&#8221;';
+
+                $input[]  = 'word word"word';
+                $output[] = 'word word&#8221;word';
+
+                $input[]  = 'word"word"word';
+                $output[] = 'word&#8221;word&#8221;word';
+
+                $input[]  = 'test sentence".';
+                $output[] = 'test sentence&#8221;.';
+
+                $input[]  = 'test sentence."';
+                $output[] = 'test sentence.&#8221;';
+
+                $input[]  = 'test sentence". word';
+                $output[] = 'test sentence&#8221;. word';
+
+                $input[]  = 'test sentence." word';
+                $output[] = 'test sentence.&#8221; word';
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_closing_single_quote() {
+                $input  = array();
+                $output = array();
+
+                // Single quote followed by a space or a period becomes &#8217; (closing_single_quote)
+
+                $input[]  = "word word' word";
+                $output[] = "word word&#8217; word";
+
+                $input[]  = "word word'. word";
+                $output[] = "word word&#8217;. word";
+
+                $input[]  = "word word'.word";
+                $output[] = "word word&#8217;.word";
+
+                $input[]  = "word word'";
+                $output[] = "word word&#8217;";
+
+                $input[]  = "test sentence'.";
+                $output[] = "test sentence&#8217;.";
+
+                $input[]  = "test sentence.'";
+                $output[] = "test sentence.&#8217;";
+
+                $input[]  = "test sentence'. word";
+                $output[] = "test sentence&#8217;. word";
+
+                $input[]  = "test sentence.' word";
+                $output[] = "test sentence.&#8217; word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_multiplication() {
+                $input  = array();
+                $output = array();
+
+                // 9x9 becomes 9&#215;9
+
+                $input[]  = "9x9";
+                $output[] = "9&#215;9";
+
+                $input[]  = "12x34";
+                $output[] = "12&#215;34";
+
+                $input[]  = "9 x 9";
+                $output[] = "9 x 9";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_ampersand() {
+                $input  = array();
+                $output = array();
+
+                // & always becomes &#038; unless it is followed by # or ;
+
+                $input[]  = "word & word";
+                $output[] = "word &#038; word";
+
+                $input[]  = "word&word";
+                $output[] = "word&#038;word";
+
+                $input[]  = "word &nbsp; word";
+                $output[] = "word &nbsp; word";
+
+                $input[]  = "word &#038; word";
+                $output[] = "word &#038; word";
+
+                $input[]  = "word &# word";
+                $output[] = "word &# word"; // invalid output?
+
+                $input[]  = "word &44; word";
+                $output[] = "word &44; word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_cockney() {
+                $input  = array();
+                $output = array();
+
+                // "cockney" phrases begin with apos instead of opening_single_quote.
+
+                $input[]  = "word 'tain't word";
+                $output[] = "word &#8217;tain&#8217;t word";
+
+                $input[]  = "word 'twere word";
+                $output[] = "word &#8217;twere word";
+
+                $input[]  = "word 'twas word";
+                $output[] = "word &#8217;twas word";
+
+                $input[]  = "word 'tis word";
+                $output[] = "word &#8217;tis word";
+
+                $input[]  = "word 'twill word";
+                $output[] = "word &#8217;twill word";
+
+                $input[]  = "word 'til word";
+                $output[] = "word &#8217;til word";
+
+                $input[]  = "word 'bout word";
+                $output[] = "word &#8217;bout word";
+
+                $input[]  = "word 'nuff word";
+                $output[] = "word &#8217;nuff word";
+
+                $input[]  = "word 'round word";
+                $output[] = "word &#8217;round word";
+
+                $input[]  = "word 'cause word";
+                $output[] = "word &#8217;cause word";
+
+                $input[]  = "word 'em word";
+                $output[] = "word &#8216;em word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_smart_dashes() {
+                $input  = array();
+                $output = array();
+
+                // Smart dashes, etc
+
+                $input[]  = "word --- word";
+                $output[] = "word &#8212; word";
+
+                $input[]  = "word---word";
+                $output[] = "word&#8212;word";
+
+                $input[]  = "word -- word";
+                $output[] = "word &#8212; word";
+
+                $input[]  = "word--word";
+                $output[] = "word&#8211;word";
+
+                $input[]  = "word - word";
+                $output[] = "word &#8211; word";
+
+                $input[]  = "word-word";
+                $output[] = "word-word";
+
+                $input[]  = "word xn&#8211; word";
+                $output[] = "word xn-- word";
+
+                $input[]  = "wordxn&#8211;word";
+                $output[] = "wordxn--word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
+
+        /**
+         * Check all baseline patterns.  If anything ever changes in wptexturize(), these tests may fail.
+         *
+         * @ticket 22692
+         */
+        function test_misc_static_replacements() {
+                $input  = array();
+                $output = array();
+
+                $input[]  = "word ... word";
+                $output[] = "word &#8230; word";
+
+                $input[]  = "word...word";
+                $output[] = "word&#8230;word";
+
+                $input[]  = "word `` word";
+                $output[] = "word &#8220; word";
+
+                $input[]  = "word``word";
+                $output[] = "word&#8220;word";
+
+                $input[]  = "word '' word";
+                $output[] = "word &#8221; word";
+
+                $input[]  = "word''word";
+                $output[] = "word&#8221;word";
+
+                $input[]  = "word (tm) word";
+                $output[] = "word &#8482; word";
+
+                $input[]  = "word (tm)word";
+                $output[] = "word &#8482;word";
+
+                $input[]  = "word(tm) word";
+                $output[] = "word(tm) word";
+
+                $input[]  = "word(tm)word";
+                $output[] = "word(tm)word";
+
+                foreach($input as $key => $in) {
+                        $this->assertEquals( $output[$key], wptexturize( $in ) );
+                }
+        }
 }

tests/phpunit/tests/shortcode.php

@@ -373 +373 @@
                 remove_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts2' ), 10, 3 );
         }
 
+        /**
+         * 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> &nbsp;[gallery ids=\"37,15,11\"] &nbsp;</p>";
+
+                $output = "[gallery ids=\"37,15,11\"]";
+
+                foreach($input as $in) {
+                        $this->assertEquals( $output, shortcode_unautop( $in ) );
+                }
+        }
 }