Ticket #34939: 34939.diff

src/wp-includes/formatting.php

@@ -216 +216 @@
 
         // Look for shortcodes and HTML elements.
 
-        preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20]++)@', $text, $matches );
+        preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $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

@@ -95 +95 @@
                 return;
         }
 
-        if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20]@', $tag ) ) {
-                /* translators: %s: shortcode name */
-                $message = sprintf( __( 'Invalid shortcode name: %s. Do not use spaces or reserved characters: & / < > [ ]' ), $tag );
+        if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $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' );
                 return;
         }
@@ -210 +210 @@
                 return $content;
 
         // Find all registered tag names in $content.
-        preg_match_all( '@\[([^<>&/\[\]\x00-\x20]++)@', $content, $matches );
+        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
         $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 
         if ( empty( $tagnames ) ) {
@@ -312 +312 @@
         }
 
         $tag = $m[2];
-        $attr = shortcode_parse_atts( $m[3] );
+        // Trim '=' from left side of attributes to handle shortcodes in the [shortcode=XXX] format (not a recommended format)
+        $attr = shortcode_parse_atts( ltrim( $m[3], '=' ) );
 
         if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
                 /* translators: %s: shortcode tag */
@@ -578 +579 @@
                 return $content;
 
         // Find all registered tag names in $content.
-        preg_match_all( '@\[([^<>&/\[\]\x00-\x20]++)@', $content, $matches );
+        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
         $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 
         if ( empty( $tagnames ) ) {

tests/phpunit/tests/shortcode.php

@@ -647 +647 @@
 
         }
 
+        /**
+         * @ticket 34939
+         *
+         * Test the (not recommended) [shortcode=XXX] format
+         */
+        function test_unnamed_attribute() {
+                $out = do_shortcode('[dumptag=http://wordpress.com/]');
+                $expected = "0 = http://wordpress.com\n";
+                $this->assertEquals($expected, $out);
+        }
 }