Ticket #20342: 20342.2.diff

src/wp-includes/formatting.php

@@ -79 +79 @@
                         $dynamic[ '/\'(\d)/'                   ] = $apos . '$1'; // '99
                 }
                 if ( "'" != $opening_single_quote )
-                        $dynamic[ '/(\s|\A|[([{<]|")\'/'       ] = '$1' . $opening_single_quote; // opening single quote, even after (, {, <, [
+                        $dynamic[ '/(\s|\A|[([{<-]|")\'/'      ] = '$1' . $opening_single_quote; // opening single quote, even after (, {, <, [, -
                 if ( '"' != $double_prime )
                         $dynamic[ '/(\d)"/'                    ] = '$1' . $double_prime; // 9" (double prime)
                 if ( "'" != $prime )
@@ -87 +87 @@
                 if ( "'" != $apos )
                         $dynamic[ '/(\S)\'([^\'\s])/'          ] = '$1' . $apos . '$2'; // apostrophe in a word
                 if ( '"' != $opening_quote )
-                        $dynamic[ '/(\s|\A|[([{<])"(?!\s)/'    ] = '$1' . $opening_quote . '$2'; // opening double quote, even after (, {, <, [
+                        $dynamic[ '/(\s|\A|[([{<-])"(?!\s)/'   ] = '$1' . $opening_quote . '$2'; // opening double quote, even after (, {, <, [, -
                 if ( '"' != $closing_quote )
                         $dynamic[ '/"(\s|\S|\Z)/'              ] = $closing_quote . '$1'; // closing double quote
                 if ( "'" != $closing_single_quote )
@@ -134 +134 @@
                 } elseif ( '[' === $first ) {
                         _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
                 } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
+                        // regular expressions
+                        $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
                         // This is not a tag, nor is the texturization disabled static strings
                         $curl = str_replace($static_characters, $static_replacements, $curl);
-                        // regular expressions
-                        $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
                 }
                 $curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
         }

tests/phpunit/tests/formatting/WPTexturize.php

@@ -194 +194 @@
                 $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
                 $this->assertEquals( ' — ', wptexturize( ' -- ') );
         }
+
+        /**
+         * @ticket 20342
+         */
+        function test_quotes_after_emdash() {
+                $this->assertEquals( '<p>I also remember the line in &#8220;Casey at the Bat&#8221; when he struck out&#8212; &#8220;There is no Joy in Mudville!!!&#8221;</p>', wptexturize( '<p>I also remember the line in "Casey at the Bat" when he struck out--- "There is no Joy in Mudville!!!"</p>' ) );
+        }
 }