From 12de05107e4c8b006bde6ee8916f34eb476d08da Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 13 Jun 2008 17:21:00 +0000 Subject: WP Merge with revision 8075 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/formatting.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'wp-includes/formatting.php') diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 052445d..c49b663 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -839,6 +839,9 @@ function human_time_diff( $from, $to = '' ) { function wp_trim_excerpt($text) { // Fakes an excerpt if needed if ( '' == $text ) { $text = get_the_content(''); + + $text = strip_shortcodes( $text ); + $text = apply_filters('the_content', $text); $text = str_replace(']]>', ']]>', $text); $text = strip_tags($text); @@ -1129,6 +1132,10 @@ function wp_richedit_pre($text) { $output = str_replace('<', '&lt;', $output); $output = str_replace('>', '&gt;', $output); + // These should be entities too + $output = str_replace('<', '<', $output); + $output = str_replace('>', '>', $output); + return apply_filters('richedit_pre', $output); } -- cgit