Changeset 12302 for trunk/wp-includes/default-filters.php

Timestamp:

12/01/2009 07:46:36 AM (14 years ago)

Author:

azaozz

Message:

Separate the removal of <p> wrapping from shortcodes into another function and apply it with different filter, props miqrogroove, props mdawaffe, see #11257, see #11249

File:

• trunk/wp-includes/default-filters.php (modified) (2 diffs)

trunk/wp-includes/default-filters.php

@@ -89 +89 @@
 // Format text area for display.
 foreach ( array( 'term_description' ) as $filter ) {
-    add_filter( $filter, 'wptexturize'   );
-    add_filter( $filter, 'convert_chars' );
-    add_filter( $filter, 'wpautop'       );
+    add_filter( $filter, 'wptexturize'      );
+    add_filter( $filter, 'convert_chars'    );
+    add_filter( $filter, 'wpautop'          );
+    add_filter( $filter, 'shortcode_unautop');
 }
 
@@ -108 +109 @@
 add_filter( 'the_content', 'convert_chars'      );
 add_filter( 'the_content', 'wpautop'            );
+add_filter( 'the_content', 'shortcode_unautop'  );
 add_filter( 'the_content', 'prepend_attachment' );
 
-add_filter( 'the_excerpt',     'wptexturize'     );
-add_filter( 'the_excerpt',     'convert_smilies' );
-add_filter( 'the_excerpt',     'convert_chars'   );
-add_filter( 'the_excerpt',     'wpautop'         );
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt' );
+add_filter( 'the_excerpt',     'wptexturize'      );
+add_filter( 'the_excerpt',     'convert_smilies'  );
+add_filter( 'the_excerpt',     'convert_chars'    );
+add_filter( 'the_excerpt',     'wpautop'          );
+add_filter( 'the_excerpt',     'shortcode_unautop');
+add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
 
 add_filter( 'comment_text', 'wptexturize'            );