Changeset 7594

Timestamp:

04/03/2008 03:15:06 AM (18 years ago)

Author:

markjaquith

Message:

Parse shortcodes AFTER wpautop() to avoid mangling. Have wptexturize() ignore shortcodes so quotes stay straight. fixes #6444 for 2.5.1

Location:

branches/2.5/wp-includes

Files:

• formatting.php (modified) (2 diffs)
• shortcodes.php (modified) (1 diff)

branches/2.5/wp-includes/formatting.php

@@ -6 +6 @@
     $output = '';
     $curl = '';
-    $textarr = preg_split('/(<.*>)/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+    $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
     $stop = count($textarr);
 
@@ -27 +27 @@
         $curl = $textarr[$i];
 
-        if (isset($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
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);

branches/2.5/wp-includes/shortcodes.php

@@ -130 +130 @@
 }
 
-add_filter( 'the_content', 'do_shortcode', 9 );
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop() 
 
 ?>