Changeset 28718

Timestamp:

06/10/2014 02:08:05 AM (11 years ago)

Author:

wonderboymusic

Message:

In wptexturize(), treat   like whitespace when texturizing hyphens.

Adds unit tests.

Props redsweater, miqrogroove.
Fixes #23185.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -80 +80 @@
         }
 
-        $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 );
+        $static_characters = array_merge( array( '---', '...', '``', '\'\'', ' (tm)' ), $cockney );
+        $static_replacements = array_merge( array( $em_dash, '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
         $spaces = wp_spaces_regexp();
@@ -128 +128 @@
             $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
         }
+
+        // Dashes and spaces
+        $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;
+        $dynamic[ '/(?<!xn)--/' ] = $en_dash;
+        $dynamic[ '/(?<=' . $spaces . ')-(?=' . $spaces . ')/' ] = $en_dash;
 
         $dynamic_characters = array_keys( $dynamic );

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -188 +188 @@
      */
     function test_spaces_around_hyphens() {
+        $nbsp = "\xC2\xA0";
+
         $this->assertEquals( ' – ', wptexturize( ' - ' ) ); 
         $this->assertEquals( ' – ', wptexturize( ' - ' ) );
         $this->assertEquals( ' – ', wptexturize( ' - ' ) );
         $this->assertEquals( ' – ', wptexturize( ' - ') );
+        $this->assertEquals( "$nbsp–$nbsp", wptexturize( "$nbsp-$nbsp" ) );
+        $this->assertEquals( " –$nbsp", wptexturize( " -$nbsp" ) );
+        $this->assertEquals( "$nbsp– ", wptexturize( "$nbsp- ") );
 
         $this->assertEquals( ' — ', wptexturize( ' -- ' ) ); 
@@ -197 +202 @@
         $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
         $this->assertEquals( ' — ', wptexturize( ' -- ') );
+        $this->assertEquals( "$nbsp—$nbsp", wptexturize( "$nbsp--$nbsp" ) );
+        $this->assertEquals( " —$nbsp", wptexturize( " --$nbsp" ) );
+        $this->assertEquals( "$nbsp— ", wptexturize( "$nbsp-- ") );
     }
 
@@ -930 +938 @@
             array(
                 "word xn– word",
-                "word xn-- word",
+                "word xn– word",
             ),
             array(
                 "wordxn–word",
+                "wordxn–word",
+            ),
+            array(
+                "wordxn--word",
                 "wordxn--word",
             ),