Index: wp-includes/shortcodes.php
===================================================================
--- wp-includes/shortcodes.php	(revision 7601)
+++ wp-includes/shortcodes.php	(working copy)
@@ -88,10 +88,10 @@
 
 	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, FALSE, $tag);
 	}
 }