Ticket #17144: 17144.can_richedit.patch

wp-includes/general-template.php

@@ -1739 +1739 @@
                         !$is_iphone && // this includes all Safari mobile browsers
                         ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
                                 !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
-                                && 'comment.php' != $pagenow ) {
+                ) {
                         $wp_rich_edit = true;
                 } else {
                         $wp_rich_edit = false;

wp-includes/class-wp-editor.php

@@ -82 +82 @@
                 if ( !empty($set['editor_css']) )
                         echo $set['editor_css'] . "\n";
 
-                if ( $this->can_richedit || $set['media_buttons'] ) {
+                if ( ( ! empty( $buttons) && $this->can_richedit ) || $set['media_buttons'] ) {
                         echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools">';
                         echo $buttons;