From 0477e4426d044b154f8de05ad0ab29a187276194 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Fri, 27 Feb 2009 17:01:59 +0000
Subject: [PATCH] Fix regression in shortcode behaviour. Fixes #9238 props
 tellyworth.

git-svn-id: https://develop.svn.wordpress.org/trunk@10658 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/shortcodes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 602e7fa9db..45e144941b 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];
 	}
 }