Changeset 18952 for trunk/wp-includes/formatting.php

Timestamp:

10/12/2011 04:50:30 PM (14 years ago)

Author:

ryan

Message:

Avoid preg backtrack limit errors with large posts when processing shortcodes. Props mdawaffe. fixes #15600

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -233 +233 @@
  * @return string The filtered content.
  */
-function shortcode_unautop($pee) {
+function shortcode_unautop( $pee ) {
     global $shortcode_tags;
 
-    if ( !empty($shortcode_tags) && is_array($shortcode_tags) ) {
-        $tagnames = array_keys($shortcode_tags);
-        $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
-        $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
-    }
-
-    return $pee;
+    if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+        return $pee;
+    }
+
+    $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+
+    $pattern =
+          '/'
+        . '<p>'                              // Opening paragraph
+        . '\\s*+'                            // Optional leading whitespace
+        . '('                                // 1: The shortcode
+        .     '\\['                          // Opening bracket
+        .     "($tagregexp)"                 // 2: Shortcode name
+        .     '\\b'                          // Word boundary
+                                             // Unroll the loop: Inside the opening shortcode tag
+        .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
+        .     '(?:'
+        .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+        .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
+        .     ')*?'
+        .     '(?:'
+        .         '\\/\\]'                   // Self closing tag and closing bracket
+        .     '|'
+        .         '\\]'                      // Closing bracket
+        .         '(?:'                      // Unroll the loop: Optionally, anything between the opening and closing shortcode tags
+        .             '[^\\[]*+'             // Not an opening bracket
+        .             '(?:'
+        .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag
+        .                 '[^\\[]*+'         // Not an opening bracket
+        .             ')*+'
+        .             '\\[\\/\\2\\]'         // Closing shortcode tag
+        .         ')?'
+        .     ')'
+        . ')'
+        . '\\s*+'                            // optional trailing whitespace
+        . '<\\/p>'                           // closing paragraph
+        . '/s';
+
+    return preg_replace( $pattern, '$1', $pee );
 }