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

Timestamp:

06/16/2015 12:49:45 AM (11 years ago)

Author:

wonderboymusic

Message:

Improve the consistency of punctuation matching in wptexturize().

Adds unit tests.

Props miqrogroove.
Fixes #31886.

File:

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

trunk/src/wp-includes/formatting.php

@@ -128 +128 @@
         // '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;
+            $dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
         }
         if ( "'" !== $apos || '"' !== $closing_quote ) {
-            $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
+            $dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
         }
 
@@ -151 +151 @@
         // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
         if ( "'" !== $apos ) {
-            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
         }
 
@@ -161 +161 @@
         // Single quotes followed by spaces or ending punctuation.
         if ( "'" !== $closing_single_quote ) {
-            $dynamic[ '/\'(?=\Z|[.,)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote;
+            $dynamic[ '/\'(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote;
         }