Changeset 28716 for trunk/src/wp-includes/formatting.php

Timestamp:

06/10/2014 01:54:11 AM (11 years ago)

Author:

wonderboymusic

Message:

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 #27588.

File:

• trunk/src/wp-includes/formatting.php (modified) (4 diffs)

trunk/src/wp-includes/formatting.php

@@ -83 +83 @@
         $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
-        /*
-         * 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| ';
+        $spaces = wp_spaces_regexp();
 
 
@@ -371 +364 @@
 
     $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
@@ -400 +394 @@
         .     ')'
         . ')'
-        . '\\s*+'                            // optional trailing whitespace
+        . '(?:' . $spaces . ')*+'            // optional trailing whitespace
         . '<\\/p>'                           // closing paragraph
         . '/s';
@@ -3858 +3852 @@
 
     if ( empty( $spaces ) ) {
+        /**
+         * 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
+         */
         $spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
     }