diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 66bdfb39d..c1c6862ba 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -188,10 +188,10 @@ function do_shortcode_tag($m) {
 
 	if ( isset($m[4]) ) {
 		// enclosing tag - extra parameter
-		return call_user_func($shortcode_tags[$tag], $attr, $m[4]);
+		return call_user_func($shortcode_tags[$tag], $attr, $m[4], $tag);
 	} else {
 		// self-closing tag
-		return call_user_func($shortcode_tags[$tag], $attr);
+		return call_user_func($shortcode_tags[$tag], $attr, NULL, $tag);
 	}
 }