Ticket #35022: 35022.2.patch

src/wp-includes/formatting.php

@@ -216 +216 @@
 
         // Look for shortcodes and HTML elements.
 
-        preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
+        preg_match_all( '@\[/?([^' . WP_SHORTCODE_NAME_TERMINATORS  . ']++)@u', $text, $matches );
         $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
         $found_shortcodes = ! empty( $tagnames );
         $shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';

src/wp-includes/shortcodes.php

@@ -41 +41 @@
  */
 $shortcode_tags = array();
 
+define( 'WP_SHORTCODE_NAME_TERMINATORS', '<>&\/\[\]\x00-\x20=\x{00a0}' );
+
 /**
  * Add hook for shortcode tag.
  *
@@ -95 +97 @@
                 return;
         }
 
-        if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $tag ) ) {
+        if ( 0 !== preg_match( '@[' . WP_SHORTCODE_NAME_TERMINATORS . ']@u', $tag ) ) {
                 /* translators: 1: shortcode name, 2: space separated list of reserved characters */
                 $message = sprintf( __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ), $tag, '& / < > [ ] =' );
                 _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
@@ -210 +212 @@
                 return $content;
 
         // Find all registered tag names in $content.
-        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
+        preg_match_all( '@\[([^' . WP_SHORTCODE_NAME_TERMINATORS . ']++)@u', $content, $matches );
         $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 
         if ( empty( $tagnames ) ) {
@@ -578 +580 @@
                 return $content;
 
         // Find all registered tag names in $content.
-        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
+        preg_match_all( '@\[([^' . WP_SHORTCODE_NAME_TERMINATORS . ']++)@u', $content, $matches );
         $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 
         if ( empty( $tagnames ) ) {