Ticket #28564: miqro-28564-part2.2.patch

src/wp-includes/formatting.php

@@ -198 +198 @@
                 .       '(?(?=!--)'     // Is this a comment?
                 .               '.+?--\s*>'     // Find end of comment
                 .       '|'
-                .               '.+?>'          // Find end of element
+                .               '[^>]+>'        // Find end of element
                 .       ')'
                 . '|'
                 .       '\['            // Find start of shortcode.
@@ -206 +206 @@
                 .       '(?:'
                 .               '[^\[\]<>]'     // Shortcodes do not contain other shortcodes.
                 .       '|'
-                .               '<.+?>'         // HTML elements permitted. Prevents matching ] before >.
+                .               '<[^>]+>'       // HTML elements permitted. Prevents matching ] before >.
                 .       ')+'
                 .       '\]'            // Find end of shortcode.
                 .       '\]?'           // Shortcodes may end with ]]
@@ -224 +224 @@
                                 _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
                         }
 
-                } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<.+?>)+\]$/', $curl ) ) {
+                } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)+\]$/', $curl ) ) {
                         // This is a shortcode delimeter.
 
                         _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
 
-                } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<.+?>)+\]\]?$/', $curl ) ) {
+                } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)+\]\]?$/', $curl ) ) {
                         // This is an escaped shortcode delimeter.
 
                         // Do not texturize.

tests/phpunit/tests/formatting/WPTexturize.php

@@ -1305 +1305 @@
                                 'word <img src="http://example.com/wp-content/uploads/2014/06/image-300x216.gif" /> word', // Ensure we are not corrupting image URLs.
                                 'word <img src="http://example.com/wp-content/uploads/2014/06/image-300x216.gif" /> word',
                         ),
+                        array(
+                                '[ do texturize "[quote]" here ]',
+                                '[ do texturize &#8220;[quote]&#8221; here ]',
+                        ),
+                        array(
+                                '[ regex catches this <a href="[quote]">here</a> ]',
+                                '[ regex catches this <a href="[quote]">here</a> ]',
+                        ),
+                        array(
+                                '[ but also catches the <b>styled "[quote]" here</b> ]',
+                                '[ but also catches the <b>styled &#8220;[quote]&#8221; here</b> ]',
+                        ),
+                        array(
+                                '[Let\'s get crazy<input>[plugin code="<a href=\'?a[]=100\'>hello</a>"]</input>world]',
+                                '[Let&#8217;s get crazy<input>[plugin code="<a href=\'?a[]=100\'>hello</a>"]</input>world]',
+                        ),
                 );
         }