WordPress.org

Make WordPress Core

Changeset 18519


Ignore:
Timestamp:
08/07/2011 05:03:18 PM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp-editor.php

    r18516 r18519  
    8383            echo $set['editor_css'] . "\n";
    8484
    85         if ( $this->can_richedit || $set['media_buttons'] ) {
     85        if ( !empty($buttons) || $set['media_buttons'] ) {
    8686            echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools">';
    8787            echo $buttons;
     
    476476        }
    477477
    478     //  reset($this->mce_settings);
    479     //  $key = key($this->mce_settings);
    480 
    481478        $ref = array(
    482479            'plugins' => implode( ',', $this->plugins ),
  • trunk/wp-includes/general-template.php

    r18498 r18519  
    17401740            ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
    17411741                !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
    1742                 && 'comment.php' != $pagenow ) {
     1742        ) {
    17431743            $wp_rich_edit = true;
    17441744        } else {
Note: See TracChangeset for help on using the changeset viewer.