diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 602e7fa9d..45e144941 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -202,10 +202,10 @@ function do_shortcode_tag($m) {
 
 	if ( isset($m[5]) ) {
 		// enclosing tag - extra parameter
-		return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5]) . $m[6]; 
+		return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5], $m[2]) . $m[6];
 	} else {
 		// self-closing tag
-		return $m[1] . call_user_func($shortcode_tags[$tag], $attr) . $m[6];
+		return $m[1] . call_user_func($shortcode_tags[$tag], $attr, NULL, $m[2]) . $m[6];
 	}
 }