WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support positional attributes in shortcodes. Props tellyworth. fixes #5914 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-19 06:52:30 +00:00
parent 366cfe0d03
commit 3e9b80d5ef
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/shortcodes.php
View File

@ -97,7 +97,7 @@ function do_shortcode_tag($m) {
function shortcode_parse_atts($text) { function shortcode_parse_atts($text) {
$atts = array(); $atts = array();
$pattern = '/(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)/'; $pattern = '/(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) { if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
foreach ($match as $m) { foreach ($match as $m) {
if (!empty($m[1])) if (!empty($m[1]))
@ -106,6 +106,10 @@ function shortcode_parse_atts($text) {
$atts[strtolower($m[3])] = stripcslashes($m[4]); $atts[strtolower($m[3])] = stripcslashes($m[4]);
elseif (!empty($m[5])) elseif (!empty($m[5]))
$atts[strtolower($m[5])] = stripcslashes($m[6]); $atts[strtolower($m[5])] = stripcslashes($m[6]);
elseif (isset($m[7]) and strlen($m[7]))
$atts[] = stripcslashes($m[7]);
elseif (isset($m[8]))
$atts[] = stripcslashes($m[8]);
} }
} }
return $atts; return $atts;