Ticket #23185: miqro-23185.patch

src/wp-includes/formatting.php

@@ -70 +70 @@
                         $cockney = $cockneyreplace = array();
                 }
 
-                $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 );
 
                 /*
                  * Regex for common whitespace characters.
@@ -126 +126 @@
                         $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 );
                 $dynamic_replacements = array_values( $dynamic );
         }

tests/phpunit/tests/formatting/WPTexturize.php

@@ -187 +187 @@
          * @ticket 23185
          */
         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( ' -- ' ) ); 
                 $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-- ") );
         }
 
         /**
@@ -929 +937 @@
                         ),
                         array(
                                 "word xn– word",
-                                "word xn-- word",
+                                "word xn– word",
                         ),
                         array(
                                 "wordxn–word",
+                                "wordxn–word",
+                        ),
+                        array(
                                 "wordxn--word",
+                                "wordxn--word",
                         ),
                 );
         }