From 539565c49ab6c2ca472b043c20375d25af2088ed Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sun, 24 Aug 2008 14:19:05 +0000
Subject: [PATCH] Remove extra filter, fixes #7585

git-svn-id: https://develop.svn.wordpress.org/trunk@8721 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/general-template.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 81c5e36dbb..a17ed501fa 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -955,7 +955,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 
 	$rows = "rows='$rows'";	?>
 	<div id="editor-toolbar">
-	<?php if ( user_can_richedit() && $media_buttons ) {
+	<?php if ( user_can_richedit() ) {
 		$wp_default_editor = wp_default_editor(); ?>
 		<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
 		<?php if ( 'tinymce' == $wp_default_editor ) {
@@ -967,8 +967,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 			<a id="edButtonHTML" class="active"><?php _e('HTML'); ?></a>
 			<a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>');"><?php _e('Visual'); ?></a>
 		<?php }
-	} else
-		add_filter('the_editor_content', 'wp_htmledit_pre');
+	}
 
 /*	if ( $media_buttons ) { ?>
 		<div id="media-buttons" class="hide-if-no-js">