Changes from branches/4.0/src/wp-includes/formatting.php at r30450 to trunk/src/wp-includes/formatting.php at r29707

File:

• trunk/src/wp-includes/formatting.php (modified) (4 diffs)

trunk/src/wp-includes/formatting.php

@@ -29 +29 @@
  */
 function wptexturize($text, $reset = false) {
-    global $wp_cockneyreplace, $shortcode_tags;
+    global $wp_cockneyreplace;
     static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
         $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
@@ -206 +206 @@
     // Look for shortcodes and HTML elements.
 
-    $tagnames = array_keys( $shortcode_tags );
-    $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
-    $tagregexp = "(?:$tagregexp)(?![\\w-])"; // Excerpt of get_shortcode_regex().
-
-    $comment_regex =
-          '!'           // Start of comment, after the <.
-        . '(?:'         // Unroll the loop: Consume everything until --> is found.
-        .     '-(?!->)' // Dash not followed by end of comment.
-        .     '[^\-]*+' // Consume non-dashes.
-        . ')*+'         // Loop possessively.
-        . '-->';        // End of comment.
-
     $regex =  '/('          // Capture the entire match.
         .   '<'     // Find start of element.
         .   '(?(?=!--)' // Is this a comment?
-        .       $comment_regex  // Find end of comment
+        .       '.+?--\s*>' // Find end of comment
         .   '|'
         .       '[^>]+>'    // Find end of element
@@ -227 +215 @@
         . '|'
         .   '\['        // Find start of shortcode.
-        .   '[\/\[]?'   // Shortcodes may begin with [/ or [[
-        .   $tagregexp  // Only match registered shortcodes, because performance.
+        .   '\[?'       // Shortcodes may begin with [[
         .   '(?:'
-        .       '[^\[\]<>]+'    // Shortcodes do not contain other shortcodes. Quantifier critical.
+        .       '[^\[\]<>]' // Shortcodes do not contain other shortcodes.
         .   '|'
-        .       '<[^\[\]>]*>'   // HTML elements permitted. Prevents matching ] before >.
-        .   ')*+'       // Possessive critical.
+        .       '<[^>]+>'   // HTML elements permitted. Prevents matching ] before >.
+        .   ')++'
         .   '\]'        // Find end of shortcode.
         .   '\]?'       // Shortcodes may end with ]]
@@ -255 +242 @@
             continue;
 
-        } elseif ( '[' === $first && 1 === preg_match( '/^\[\/?' . $tagregexp . '(?:[^\[\]<>]+|<[^\[\]>]*>)*+\]$/', $curl ) ) {
+        } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)++\]$/', $curl ) ) {
             // This is a shortcode delimiter.
 
             _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
 
-        } elseif ( '[' === $first && 1 === preg_match( '/^\[[\/\[]?' . $tagregexp . '(?:[^\[\]<>]+|<[^\[\]>]*>)*+\]\]?$/', $curl ) ) {
+        } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)++\]\]?$/', $curl ) ) {
             // This is an escaped shortcode delimiter.