WP Merge with revision 8300

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

1 files changed, 9 insertions, 12 deletions

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index c49b663..e2b969a 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -3,6 +3,7 @@
 function wptexturize($text) {
 	global $wp_cockneyreplace;
 	$next = true;
+	$has_pre_parent = false;
 	$output = '';
 	$curl = '';
 	$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -26,13 +27,17 @@ function wptexturize($text) {
 	for ( $i = 0; $i < $stop; $i++ ) {
  		$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 && !$has_pre_parent) { // If it's not a tag
 			// static strings
 			$curl = str_replace($static_characters, $static_replacements, $curl);
 			// regular expressions
 			$curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-		} elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
+		} elseif (strpos($curl, '<code') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
 			$next = false;
+		} elseif (strpos($curl, '<pre') !== false) {
+			$has_pre_parent = true;
+		} elseif (strpos($curl, '</pre>') !== false) {
+			$has_pre_parent = false;
 		} else {
 			$next = true;
 		}
@@ -1124,18 +1129,10 @@ function wp_richedit_pre($text) {
 	// Filtering a blank results in an annoying <br />\n
 	if ( empty($text) ) return apply_filters('richedit_pre', '');
 
-	$output = $text;
-	$output = convert_chars($output);
+	$output = convert_chars($text);
 	$output = wpautop($output);
+	$output = htmlspecialchars($output, ENT_NOQUOTES);
 
-	// These must be double-escaped or planets will collide.
-	$output = str_replace('&lt;', '&amp;lt;', $output);
-	$output = str_replace('&gt;', '&amp;gt;', $output);
-
-	// These should be entities too
-	$output = str_replace('<', '&lt;', $output);
-	$output = str_replace('>', '&gt;', $output);
-	
 	return apply_filters('richedit_pre', $output);
 }