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

Timestamp:

06/17/2014 05:40:07 PM (12 years ago)

Author:

wonderboymusic

Message:

wptexturize() adjustments:

• Only place an apostrophe before a number when it has exactly two digits.
• Never match '99' with the single prime pattern.
• Always assume '99' is an abbreviated year at the end of a quotation.
• Add unit tests.
• Resolves the unit test broken in [28721] for #8775.

See #26850.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -101 +101 @@
         $dynamic = array();
 
+        // '99' is an ambiguous case among other patterns; assume it's an abbreviated year at the end of a quotation.
+        if ( "'" !== $apos && "'" !== $closing_single_quote ) {
+            $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
+        }
+
+        // '99 '99s '99's (apostrophe)  But never '9 or '999 or '99.0.
+        if ( "'" !== $apos ) {
+            $dynamic[ '/\'(?=\d\d(?:\Z|(?!\d|[.,]\d)))/' ] = $apos;
+        }
+
         // Quoted Numbers like "42" or '42.00'
         if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
@@ -107 +117 @@
         if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
             $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
-        }
-
-        // '99 '99s '99's (apostrophe)
-        if ( "'" !== $apos ) {
-            $dynamic[ '/\'(?=\d)/' ] = $apos;
         }