Changeset 30452 for branches/3.9/src/wp-includes/formatting.php

Timestamp:

11/20/2014 02:31:09 PM (12 years ago)

Author:

nacin

Message:

Anchor texturize to shortcodes to improve regex efficiency.

For the 3.9 branch; see [30449] for trunk.

props miqrogroove.
see #29557 for segfault issues.

File:

• branches/3.9/src/wp-includes/formatting.php (modified) (3 diffs)

branches/3.9/src/wp-includes/formatting.php

@@ -153 +153 @@
         $no_texturize_shortcodes_stack = array();
 
-        $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+        // Look for shortcodes and HTML elements.
+        
+        $shortcode_regex =
+                  '\['          // Find start of shortcode.
+                . '[^\[\]<>]++' // Shortcodes do not contain other shortcodes. Possessive critical.
+                . '\]';         // Find end of shortcode.
+
+        $textarr = preg_split("/(<[^>]*>|$shortcode_regex)/s", $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 
         foreach ( $textarr as &$curl ) {
@@ -164 +171 @@
                 if ( '<' === $first ) {
                         _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
-                } elseif ( '[' === $first ) {
+                } elseif ( '[' === $first && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
                         _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
                 } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
@@ -215 +222 @@
                         array_push($stack, $matches[1]);
                 }
+        } elseif ( 0 == count( $stack ) ) {
+                // Stack is empty. Just stop.
         } else {
                 // Closing? Check $text+2 against disabled elements