Ticket #29882: 29882_embed.diff

src/wp-includes/formatting.php

@@ -44 +44 @@
                 $static_replacements = null,
                 $dynamic_characters = null,
                 $dynamic_replacements = null,
+                $dynamic_characters_embed = null,
+                $dynamic_replacements_embed = null,
                 $default_no_texturize_tags = null,
                 $default_no_texturize_shortcodes = null,
                 $run_texturize = true,
@@ -137 +139 @@
                 $dynamic = array();
                 $spaces = wp_spaces_regexp();
 
+                // Embedded quotes "'Hello' he said" she said.
+                if ( "'" !== $opening_single_quote || "'" !== $closing_single_quote || '"' !== $opening_quote || '"' !== $closing_quote ) {
+                        $dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')\'"/' ] = $open_sq_flag . $open_q_flag;
+                        $dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"\'/' ] = $open_q_flag . $open_sq_flag;
+                        $dynamic[ '/\'"(?=\z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote . $closing_quote;
+                        $dynamic[ '/"\'(?=\z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_quote . $closing_single_quote;
+
+                        $dynamic_characters_embed = array_keys( $dynamic );
+                        $dynamic_replacements_embed = array_values( $dynamic );
+                        $dynamic = array();
+                }
+
                 // '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|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
@@ -288 +302 @@
 
                         $curl = str_replace( $static_characters, $static_replacements, $curl );
 
+                        $have_q = false !== strpos( $curl, '"' ); // Need to check for double quotes beforehand in case they're turned into flags by $dynamic_characters_embed.
                         if ( false !== strpos( $curl, "'" ) ) {
+                                if ( $dynamic_characters_embed && $have_q && ( false !== strpos( $curl, '\'"' ) || false !== strpos( $curl, '"\'' ) ) ) {
+                                        $curl = preg_replace( $dynamic_characters_embed, $dynamic_replacements_embed, $curl );
+                                }
                                 $curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
                                 $curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
                                 $curl = str_replace( $apos_flag, $apos, $curl );
                                 $curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
                         }
-                        if ( false !== strpos( $curl, '"' ) ) {
+                        if ( $have_q ) {
                                 $curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
                                 $curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
                                 $curl = str_replace( $open_q_flag, $opening_quote, $curl );