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

Timestamp:

07/03/2014 04:21:18 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Fix texturization of quotes when enclosed by angle brackets.

props miqrogroove.
fixes #28718.

File:

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

trunk/src/wp-includes/formatting.php

@@ -105 +105 @@
         // '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;
         }
 
@@ -127 +126 @@
         // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
         if ( "'" !== $opening_single_quote ) {
-            $dynamic[ '/(?<=\A|[([{<"\-]|' . $spaces . ')\'/' ] = $opening_single_quote;
+            $dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $opening_single_quote;
         }
 
         // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
         if ( "'" !== $apos ) {
-            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
         }
 
@@ -147 +146 @@
         // Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
         if ( '"' !== $opening_quote ) {
-            $dynamic[ '/(?<=\A|[([{<\-]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
+            $dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
         }
 
@@ -157 +156 @@
         // Single quotes followed by spaces or ending punctuation.
         if ( "'" !== $closing_single_quote ) {
-            $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote;
+            $dynamic[ '/\'(?=\Z|[.,)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote;
         }