Changeset 34761 for trunk/src/wp-includes/shortcodes.php

Timestamp:

10/02/2015 04:25:40 AM (11 years ago)

Author:

wonderboymusic

Message:

Shortcodes/Formatting: Add PCRE Performance Testing

• Move pattern from wptexturize() into a separate function.
• Move pattern from wp_html_split() into a separate function.
• Beautify code for wp_html_split().
• Remove unnecessary instances of /s modifier in patterns that don't use dots.
• Add tests/phpunit/data/formatting/whole-posts.php for testing larger strings.
• Add function benchmark_pcre_backtracking().
• Add tests for wp_html_split().
• Add tests for wptexturize().
• Add tests for get_shortcode_regex().

Props miqrogroove.
Fixes #34121.

File:

• trunk/src/wp-includes/shortcodes.php (modified) (5 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -169 +169 @@
 
         if ( shortcode_exists( $tag ) ) {
-                preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
+                preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
                 if ( empty( $matches ) )
                         return false;
@@ -220 +220 @@
 
         $pattern = get_shortcode_regex( $tagnames );
-        $content = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
+        $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
 
         // Always restore square braces so we don't break things like <!--[if IE ]>
@@ -379 +379 @@
                         // Some plugins are doing things like [name] <[email]>.
                         if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
-                                $element = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $element );
+                                $element = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $element );
                         }
 
@@ -408 +408 @@
                                 // was written by an administrator, so we should avoid changing the output
                                 // and we do not need to run KSES here.
-                                $attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr );
+                                $attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );
                         } else {
                                 // $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
                                 // We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
                                 $count = 0;
-                                $new_attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr, -1, $count );
+                                $new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
                                 if ( $count > 0 ) {
                                         // Sanitize the shortcode output using KSES.
@@ -573 +573 @@
 
         $pattern = get_shortcode_regex( $tagnames );
-        $content = preg_replace_callback( "/$pattern/s", 'strip_shortcode_tag', $content );
+        $content = preg_replace_callback( "/$pattern/", 'strip_shortcode_tag', $content );
 
         // Always restore square braces so we don't break things like <!--[if IE ]>