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

Timestamp:

06/17/2014 08:13:54 PM (10 years ago)

Author:

wonderboymusic

Message:

In wptexturize(), adjust for the treatment of abbreviated years at the end of quotations.
Silence some unit tests that have never passed and may no longer be applicable.

Props miqrogroove.
Fixes #18549.

File:

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

trunk/src/wp-includes/formatting.php

@@ -103 +103 @@
         $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 ) {
+        // '99' and '99" are ambiguous 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;
+        }
+
+        if ( "'" !== $apos || '"' !== $closing_quote ) {
+            $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
         }
 
@@ -127 +131 @@
 
         // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
-        if ( "'" != $apos ) {
+        if ( "'" !== $apos ) {
             $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
         }
@@ -152 +156 @@
 
         // Single quotes followed by spaces or ending punctuation.
-        if ( "'" != $closing_single_quote ) {
+        if ( "'" !== $closing_single_quote ) {
             $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote; 
         }