Changeset 33518 for branches/4.2/src/wp-includes/shortcodes.php

Timestamp:

07/30/2015 07:40:33 PM (11 years ago)

Author:

azaozz

Message:

Backport r33469 and r33470 to 4.2.
See #33106.

File:

• branches/4.2/src/wp-includes/shortcodes.php (modified) (2 diffs)

branches/4.2/src/wp-includes/shortcodes.php

@@ -329 +329 @@
         
         $pattern = 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. If not found, match all input.
-
-        $regex =
-                  '/('                   // Capture the entire match.
-                .     '<'                // Find start of element.
-                .     '(?(?=!--)'        // Is this a comment?
-                .         $comment_regex // Find end of comment.
-                .     '|'
-                .         '[^>]*>?'      // Find end of element. If not found, match all input.
-                .     ')'
-                . ')/s';
-
-        $textarr = preg_split( $regex, $content, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+        $textarr = wp_html_split( $content );
 
         foreach ( $textarr as &$element ) {
-                if ( '<' !== $element[0] ) {
+                if ( '' == $element || '<' !== $element[0] ) {
                         continue;
                 }
@@ -366 +347 @@
                 }
 
-                if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) ) {
+                if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
                         // Encode all [ and ] chars.
                         $element = strtr( $element, $trans );