From aafd7c6db9956d7fa2f745397660007472f869a5 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Sun, 17 Jan 2010 22:51:15 +0000 Subject: [PATCH] Make it obvious that do_shortcode_tag passes the tag as the third parameter. plus code spacing cleanup. git-svn-id: https://develop.svn.wordpress.org/trunk@12750 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/shortcodes.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php index bad91c14ba..f2048bda63 100644 --- a/wp-includes/shortcodes.php +++ b/wp-includes/shortcodes.php @@ -190,23 +190,23 @@ function get_shortcode_regex() { * @param array $m Regular expression match array * @return mixed False on failure. */ -function do_shortcode_tag($m) { +function do_shortcode_tag( $m ) { global $shortcode_tags; // allow [[foo]] syntax for escaping a tag - if ($m[1] == '[' && $m[6] == ']') { + if ( $m[1] == '[' && $m[6] == ']' ) { return substr($m[0], 1, -1); } $tag = $m[2]; - $attr = shortcode_parse_atts($m[3]); + $attr = shortcode_parse_atts( $m[3] ); - if ( isset($m[5]) ) { + if ( isset( $m[5] ) ) { // enclosing tag - extra parameter - return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5], $m[2]) . $m[6]; + return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6]; } else { // self-closing tag - return $m[1] . call_user_func($shortcode_tags[$tag], $attr, NULL, $m[2]) . $m[6]; + return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL, $tag ) . $m[6]; } }