Changeset 36097

Timestamp:

12/26/2015 04:45:26 AM (9 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.

Props aaroncampbell.
Fixes #34939 for trunk.

Location:

trunk

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)

trunk/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 );

trunk/src/wp-includes/shortcodes.php

@@ -96 +96 @@
     }
 
-    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;
@@ -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] );
 

trunk/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);
+    }
 }