Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (revision 11639) +++ wp-includes/formatting.php (working copy) @@ -170,7 +170,7 @@ if (strpos($pee, '
]*>)(.*?)!is', 'clean_pre', $pee ); $pee = preg_replace( "|\n$|", '', $pee ); - $pee = preg_replace('/
\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee); // don't auto-p wrap shortcodes that stand alone + $pee = preg_replace('/
\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '