Ticket #12690: 12690.3.diff

src/wp-includes/formatting.php

@@ -219 +219 @@
                 .               '[^\[\]<>]'     // Shortcodes do not contain other shortcodes.
                 .       '|'
                 .               '<[^>]+>'       // HTML elements permitted. Prevents matching ] before >.
-                .       ')+'
+                .       ')++'
                 .       '\]'            // Find end of shortcode.
                 .       '\]?'           // Shortcodes may end with ]]
                 . ')/s';
@@ -241 +241 @@
 
                         continue;
 
-                } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)+\]$/', $curl ) ) {
+                } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)++\]$/', $curl ) ) {
                         // This is a shortcode delimeter.
 
                         _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
 
-                } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)+\]\]?$/', $curl ) ) {
+                } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)++\]\]?$/', $curl ) ) {
                         // This is an escaped shortcode delimeter.
 
                         // Do not texturize.