Ticket #8912: 8912.diff

src/wp-includes/formatting.php

@@ -70 +70 @@
                         $cockney = $cockneyreplace = array();
                 }
 
-                $static_characters = array_merge( array( '---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
-                $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
+                $static_characters = array_merge( array( '---', ' -- ', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
+                $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
                 $dynamic = array();
+                $dynamic['/--(?!>)/'] = $en_dash;
                 if ( "'" != $apos ) {
                         $dynamic[ '/\'(\d\d(?:’|\')?s)/' ] = $apos . '$1'; // '99's
                         $dynamic[ '/\'(\d)/'                   ] = $apos . '$1'; // '99

tests/phpunit/tests/formatting/WPTexturize.php

@@ -158 +158 @@
         /**
          * @ticket 8912
          */
-        function test_wptexturize_html_comments() {
+        function test_wptexturize_closing_html_comment() {
+                $this->assertEquals('<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>', wptexturize('<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>'));
+        }
+
+        /**
+         * @ticket 8912
+         */
+        function test_wptexturize_inside_html_comments() {
                 $this->assertEquals('<!--[if !IE]>--><!--<![endif]-->', wptexturize('<!--[if !IE]>--><!--<![endif]-->'));
                 $this->assertEquals('<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->', wptexturize('<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->'));
-                $this->assertEquals('<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>', wptexturize('<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>'));
         }
 
         /**