Changeset 31199

Timestamp:

01/16/2015 03:54:00 AM (10 years ago)

Author:

pento

Message:

When a hyphen - or double hyphen -- was at the start or the end of a string, it wasn't texturized correctly.

Fixes #31030

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -175 +175 @@
         // Dashes and spaces
         $dynamic[ '/---/' ] = $em_dash;
-        $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;
+        $dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
         $dynamic[ '/(?<!xn)--/' ] = $en_dash;
-        $dynamic[ '/(?<=' . $spaces . ')-(?=' . $spaces . ')/' ] = $en_dash;
+        $dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
 
         $dynamic_characters['dash'] = array_keys( $dynamic );

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

@@ -207 +207 @@
         $this->assertEquals( " —$nbsp", wptexturize( " --$nbsp" ) );
         $this->assertEquals( "$nbsp— ", wptexturize( "$nbsp-- ") );
+    }
+
+    /**
+     * @ticket 31030
+     */
+    function test_hyphens_at_start_and_end() {
+        $this->assertEquals( '– ', wptexturize( '- ' ) );
+        $this->assertEquals( '– –', wptexturize( '- -' ) );
+        $this->assertEquals( ' –', wptexturize( ' -' ) );
+
+        $this->assertEquals( '— ', wptexturize( '-- ' ) );
+        $this->assertEquals( '— —', wptexturize( '-- --' ) );
+        $this->assertEquals( ' —', wptexturize( ' --' ) );
     }