Changeset 7816 for branches/2.5/wp-includes/formatting.php

Timestamp:

04/25/2008 12:46:17 AM (18 years ago)

Author:

markjaquith

Message:

Don't wpautop()-wrap shortcodes that stand alone. fixes #6444 for 2.5.1

File:

• branches/2.5/wp-includes/formatting.php (modified) (1 diff)

branches/2.5/wp-includes/formatting.php

@@ -93 +93 @@
         $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
 
     return $pee;