sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shortcodes: Allow using single quotes for empty value attributes. 

Props enrico.sorcinelli.
Fixes #37304.

git-svn-id: https://develop.svn.wordpress.org/trunk@41026 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2017-07-11 00:53:33 +00:00
parent 4c5bb9758a
commit e4bfc8ca90
4 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-includes/js/shortcode.js
View File

@ -134,8 +134,9 @@ window.wp = window.wp || {};
// 5. An attribute name, that corresponds to...
// 6. an unquoted value.
// 7. A numeric attribute in double quotes.
// 8. An unquoted numeric attribute.
pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/g;
// 8. A numeric attribute in single quotes.
// 9. An unquoted numeric attribute.
pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|'([^']*)'(?:\s|$)|(\S+)(?:\s|$)/g;
// Map zero-width spaces to actual spaces.
text = text.replace( /[\u00a0\u200b]/g, ' ' );
@ -152,6 +153,8 @@ window.wp = window.wp || {};
numeric.push( match[7] );
} else if ( match[8] ) {
numeric.push( match[8] );
} else if ( match[9] ) {
numeric.push( match[9] );
}
}

6
src/wp-includes/shortcodes.php
View File

@ -487,7 +487,7 @@ function unescape_invalid_shortcodes( $content ) {
* @return string The shortcode attribute regular expression
*/
function get_shortcode_atts_regex() {
return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|\'([^\']*)\'(?:\s|$)|(\S+)(?:\s|$)/';
}
/**
@ -519,8 +519,10 @@ function shortcode_parse_atts($text) {
$atts[strtolower($m[5])] = stripcslashes($m[6]);
elseif (isset($m[7]) && strlen($m[7]))
$atts[] = stripcslashes($m[7]);
elseif (isset($m[8]))
elseif (isset($m[8]) && strlen($m[8]))
$atts[] = stripcslashes($m[8]);
elseif (isset($m[9]))
$atts[] = stripcslashes($m[9]);
}
// Reject any unclosed HTML elements

30
tests/phpunit/tests/shortcode.php
View File

@ -840,4 +840,34 @@ EOF;
);
return wp_json_encode( $arr );
}
/**
* @ticket 37304
*
* Test 'value' syntax for empty attributes
*/
function test_empty_single_quote_attribute() {
$out = do_shortcode( '[test-shortcode-tag a="foo" b=\'bar\' c=baz foo \'bar\' "baz" ]test empty atts[/test-shortcode-tag]' );
$this->assertEquals( array( 'a' => 'foo', 'b' => 'bar', 'c' => 'baz', 0 => 'foo', 1 => 'bar', 2 => 'baz' ), $this->atts );
}
/**
* @ticket 37304
*/
function test_positional_atts_single_quotes() {
$out = do_shortcode( "[test-shortcode-tag 'something in quotes' 'something else']" );
$this->assertEquals( '', $out );
$this->assertEquals( array( 0 => 'something in quotes', 1 => 'something else' ), $this->atts );
$this->assertEquals( 'test-shortcode-tag', $this->tagname );
}
/**
* @ticket 37304
*/
function test_positional_atts_mixed_quotes() {
$out = do_shortcode( "[test-shortcode-tag 'something in quotes' \"something else\" 123 foo bar='baz' example=\"test\" ]" );
$this->assertEquals( '', $out );
$this->assertEquals( array( 0 => 'something in quotes', 1 => 'something else', 2 => '123', 3 => 'foo', 'bar' => 'baz', 'example' => 'test'), $this->atts );
$this->assertEquals( 'test-shortcode-tag', $this->tagname );
}
}

16
tests/qunit/wp-includes/js/shortcode.js
View File

@ -196,4 +196,20 @@ jQuery( function() {
deepEqual( wp.shortcode.attrs('foo not="a blocker" bar baz'), expected, 'attr parsed numeric attributes');
});
test( 'attrs() should return numeric attributes created with single, double, and no quotes', function() {
var expected = {
'named': {}, 'numeric' : ['foo', 'bar', 'baz']
};
deepEqual( wp.shortcode.attrs('foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
});
test( 'attrs() should return mixed attributes created with single, double, and no quotes', function() {
var expected = {
'named': { a: 'foo', b: 'bar', c: 'baz' }, 'numeric' : ['foo', 'bar', 'baz']
};
deepEqual( wp.shortcode.attrs('a="foo" b=\'bar\' c=baz foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
});
});