Changeset 36098

Timestamp:

12/26/2015 04:47:58 AM (11 years ago)

Author:

dd32

Message:

Shortcodes: = is a reserved character in shortcode names, mark it as such.

This allows for shortcodes such as [shortcode=attribute] to work, which while never intentionally supported were widely used in the pre-shortcode days.

Merges [36097] to the 4.4 branch, minus a string change.
Props aaroncampbell.
Fixes #34939.

Location:

branches/4.4

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/shortcodes.php (modified) (3 diffs)
• tests/phpunit/tests/shortcode.php (modified) (1 diff)

branches/4.4/src/wp-includes/formatting.php

@@ -217 +217 @@
         // 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 );

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

@@ -96 +96 @@
         }
 
-        if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20]@', $tag ) ) {
+        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 );
@@ -211 +211 @@
 
         // 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] );
 
@@ -579 +579 @@
 
         // 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] );
 

branches/4.4/tests/phpunit/tests/shortcode.php

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