Changeset 18519

Timestamp:

08/07/2011 05:03:18 PM (13 years ago)

Author:

azaozz

Message:

WP_Editor: don't show empty div if no editor-buttons and media-buttons are shown, props ocean90, see #17144

Location:

trunk/wp-includes

Files:

• class-wp-editor.php (modified) (2 diffs)
• general-template.php (modified) (1 diff)

trunk/wp-includes/class-wp-editor.php

@@ -83 +83 @@
             echo $set['editor_css'] . "\n";
 
-        if ( $this->can_richedit || $set['media_buttons'] ) {
+        if ( !empty($buttons) || $set['media_buttons'] ) {
             echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools">';
             echo $buttons;
@@ -476 +476 @@
         }
 
-    //  reset($this->mce_settings);
-    //  $key = key($this->mce_settings);
-
         $ref = array(
             'plugins' => implode( ',', $this->plugins ),

trunk/wp-includes/general-template.php

@@ -1740 +1740 @@
             ( ( 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 {