Changeset 7816

Timestamp:

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

Author:

markjaquith

Message:

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

Location:

branches/2.5/wp-includes

Files:

• formatting.php (modified) (1 diff)
• shortcodes.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;

branches/2.5/wp-includes/shortcodes.php

@@ -73 +73 @@
         return $content;
 
+    $pattern = get_shortcode_regex();
+    return preg_replace_callback('/'.$pattern.'/s', 'do_shortcode_tag', $content);
+}
+
+function get_shortcode_regex() {
+    global $shortcode_tags;
     $tagnames = array_keys($shortcode_tags);
     $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 
-    $pattern = '/\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?/s';
-
-    return preg_replace_callback($pattern, 'do_shortcode_tag', $content);
+    return '\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?';
 }