WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 7 insertions, 0 deletions

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('<', '<', $output);
 	$output = str_replace('>', '>', $output);
 
+	// These should be entities too
+	$output = str_replace('<', '&lt;', $output);
+	$output = str_replace('>', '&gt;', $output);
+	
 	return apply_filters('richedit_pre', $output);
 }