Changeset 28725

Timestamp:

06/10/2014 02:13:52 PM (11 years ago)

Author:

wonderboymusic

Message:

wptexturize() should handle apostrophes before primes.

Props nacin, miqrogroove.
Fixes #22823.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -119 +119 @@
         }
 
+        // Apostrophe in a word.  No spaces or double apostrophes.
+        if ( "'" != $apos ) {
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|\'|' . $spaces . ')/' ] = $apos;
+        }
+
         // 9" (double prime)
         if ( '"' !== $double_prime ) {
@@ -127 +132 @@
         if ( "'" !== $prime ) {
             $dynamic[ '/(?<=\d)\'/' ] = $prime;
-        }
-
-        // Apostrophe in a word.  No spaces or double primes.
-        if ( "'" !== $apos ) {
-            $dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos;
         }
 

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

@@ -501 +501 @@
             ),
             array(
-                "word 99'word",
-                "word 99′word",
+                "word 99'word", // Not a prime anymore. Apostrophes get priority.
+                "word 99’word",
             ),
             array(
@@ -509 +509 @@
             ),
             array(
-                "word99'word",
-                "word99′word",
+                "word99'word", // Not a prime anymore.
+                "word99’word",
             ),
         );