Ticket #10269: 10269.diff

wp-includes/formatting.php

@@ -170 +170 @@
         if (strpos($pee, '<pre') !== false)
                 $pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
         $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-        $pee = preg_replace('/<p>\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee); // don't auto-p wrap shortcodes that stand alone
+        $pee = preg_replace('/<p>\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '<div>$1</div>', $pee); // don't auto-p wrap shortcodes that stand alone
 
         return $pee;
 }