WP Merge to rev 5007

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

1 files changed, 1 insertions, 1 deletions

diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php
index c2b5519..1f79fb7 100644
--- a/wp-admin/upload-functions.php
+++ b/wp-admin/upload-functions.php
@@ -18,7 +18,7 @@ function wp_upload_display( $dims = false, $href = '' ) {
 		the_title();
 		$post_title = attribute_escape(ob_get_contents());
 	ob_end_clean();
-	$post_content = apply_filters( 'content_edit_pre', $post->post_content );
+	$post_content = attribute_escape(apply_filters( 'content_edit_pre', $post->post_content ));
 
 	$class = 'text';
 	$innerHTML = get_attachment_innerHTML( $id, false, $dims );