WordPress.org

Make WordPress Core

Ticket #34939: 34939.2.diff

File 34939.2.diff, 2.6 KB (added by aaroncampbell, 6 years ago)
  • src/wp-includes/formatting.php

     
    216216
    217217        // Look for shortcodes and HTML elements.
    218218
    219         preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20]++)@', $text, $matches );
     219        preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
    220220        $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
    221221        $found_shortcodes = ! empty( $tagnames );
    222222        $shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
  • src/wp-includes/shortcodes.php

     
    9595                return;
    9696        }
    9797
    98         if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20]@', $tag ) ) {
    99                 /* translators: %s: shortcode name */
    100                 $message = sprintf( __( 'Invalid shortcode name: %s. Do not use spaces or reserved characters: & / < > [ ]' ), $tag );
     98        if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $tag ) ) {
     99                /* translators: 1: shortcode name, 2: space separated list of reserved characters */
     100                $message = sprintf( __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ), $tag, '& / < > [ ] =' );
    101101                _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
    102102                return;
    103103        }
     
    210210                return $content;
    211211
    212212        // Find all registered tag names in $content.
    213         preg_match_all( '@\[([^<>&/\[\]\x00-\x20]++)@', $content, $matches );
     213        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
    214214        $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
    215215
    216216        if ( empty( $tagnames ) ) {
     
    578578                return $content;
    579579
    580580        // Find all registered tag names in $content.
    581         preg_match_all( '@\[([^<>&/\[\]\x00-\x20]++)@', $content, $matches );
     581        preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
    582582        $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
    583583
    584584        if ( empty( $tagnames ) ) {
  • tests/phpunit/tests/shortcode.php

     
    647647
    648648        }
    649649
     650        /**
     651         * @ticket 34939
     652         *
     653         * Test the (not recommended) [shortcode=XXX] format
     654         */
     655        function test_unnamed_attribute() {
     656                $out = do_shortcode('[dumptag=http://wordpress.com/]');
     657                $expected = "0 = http://wordpress.com\n";
     658                $this->assertEquals($expected, $out);
     659        }
    650660}