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

Timestamp:

04/16/2008 09:09:22 PM (18 years ago)

Author:

markjaquith

Message:

Allow shortcodes to run before or after wpautop()/texturize() formatting. Default to before for WP 2.5 compat. Props AaronCampbell. fixes #6444 for 2.5.1

File:

• branches/2.5/wp-includes/formatting.php (modified) (3 diffs)

branches/2.5/wp-includes/formatting.php

@@ -27 +27 @@
         $curl = $textarr[$i];
 
-        if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag
+        if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag or shortcode
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
@@ -75 +75 @@
     $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
     $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
+    $pee = preg_replace('/<p>(\s*?' . get_shortcode_regex(true) . '\s*)<\/p>/s', '$1', $pee); // don't auto-p wrap post-formatting shortcodes
     $pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
     $pee = preg_replace( '|<p>|', "$1<p>", $pee );
@@ -841 +842 @@
         $text = apply_filters('the_content', $text);
         $text = str_replace(']]>', ']]&gt;', $text);
+        $text = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $text);
         $text = strip_tags($text);
         $excerpt_length = 55;