Changeset 28852

Timestamp:

06/26/2014 05:14:47 PM (10 years ago)

Author:

wonderboymusic

Message:

Use less greedy regex in wptexturize(). Adds unit tests.

Props miqrogroove.
See #28564.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (3 diffs)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -199 +199 @@
         .       '.+?--\s*>' // Find end of comment
         .   '|'
-        .       '.+?>'      // Find end of element
+        .       '[^>]+>'    // Find end of element
         .   ')'
         . '|'
@@ -207 +207 @@
         .       '[^\[\]<>]' // Shortcodes do not contain other shortcodes.
         .   '|'
-        .       '<.+?>'     // HTML elements permitted. Prevents matching ] before >.
+        .       '<[^>]+>'   // HTML elements permitted. Prevents matching ] before >.
         .   ')+'
         .   '\]'        // Find end of shortcode.
@@ -225 +225 @@
             }
 
-        } 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.
 

trunk/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]',
             ),
         );