Changeset 28765 for trunk/src/wp-includes/formatting.php

Timestamp:

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

Author:

wonderboymusic

Message:

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

Props miqrogroove.
Fixes #26850.

File:

• trunk/src/wp-includes/formatting.php (modified) (1 diff)

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;
         }