Ticket #26850: miqro-26850-part2.patch

src/wp-includes/formatting.php

@@ -109 +109 @@
 
                 // '99 '99s '99's (apostrophe)  But never '9 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;
                 }
 
                 // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.

tests/phpunit/tests/formatting/WPTexturize.php

@@ -313 +313 @@
                                 "word ’99’s word",
                         ),
                         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.",
                         ),
                 );
         }
@@ -1060 +1060 @@
                                 'word “4,242.00” word',
                         ),
                         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",
                         ),
                 );
         }
@@ -1341 +1341 @@
                                 "word ‘999 word",
                         ),
                         array(
+                                "word '99% word",
+                                "word ‘99% word",
+                        ),
+                        array(
                                 "word '9 word",
                                 "word ‘9 word",
                         ),