Changeset 28765

Timestamp:

06/17/2014 08:18:38 PM (11 years ago)

Author:

wonderboymusic

Message:

Fix abbreviations mixed with quotes, example: '99% of people'.
Add/alter unit tests.

Props miqrogroove.
Fixes #26850.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -112 +112 @@
         }
 
-        // '99 '99s '99's (apostrophe)  But never '9 or '999 or '99.0.
+        // '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
         if ( "'" !== $apos ) {
-            $dynamic[ '/\'(?=\d\d(?:\Z|(?!\d|[.,]\d)))/' ] = $apos;
+            $dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos;
         }
 
         // Quoted Numbers like "42" or '42.00'
         if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-            $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[\d\.\,]*)"/' ] = $opening_quote . '$1' . $closing_quote;
+            $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
         }
         if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
-            $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
+            $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
         }
 

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

@@ -314 +314 @@
             ),
             array(
-                "according to our source, '33% of all students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
-                "according to our source, ’33% of all students scored less than 50′ on the test.",
+                "according to our source, '33 students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
+                "according to our source, ’33 students scored less than 50′ on the test.",
             ),
         );
@@ -1061 +1061 @@
             ),
             array(
-                "word '99's word", // Is this correct?
-                "word ‘99’s word",
+                "word '99's word",
+                "word ’99’s word",
             ),
             array(
                 "word '99'samsonite",
-                "word ‘99’samsonite",
+                "word ’99’samsonite",
             ),
         );
@@ -1340 +1340 @@
                 "word '999 word", // Does not match the apos pattern, should be opening quote.
                 "word ‘999 word",
+            ),
+            array(
+                "word '99% word",
+                "word ‘99% word",
             ),
             array(