Ticket #46640: 46640.diff

src/wp-admin/css/edit.css

@@ -1273 +1273 @@
 /* DFW 2
 -------------------------------------------------------------- */
 
-#wp-content-wrap .mce-wp-dfw,
 #qt_content_dfw {
         display: none;
 }
 
-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
 .wp-editor-expand #qt_content_dfw {
         display: inline-block;
 }

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

@@ -587 +587 @@
 
                                 if ( ! wp_is_mobile() ) {
                                         if ( $set['_content_editor_dfw'] ) {
+                                                $mce_buttons[] = 'wp_adv';
                                                 $mce_buttons[] = 'dfw';
                                         } else {
                                                 $mce_buttons[] = 'fullscreen';
+                                                $mce_buttons[] = 'wp_adv';
                                         }
+                                } else {
+                                        $mce_buttons[] = 'wp_adv';
                                 }
 
-                                $mce_buttons[] = 'wp_adv';
-
                                 /**
                                  * Filters the first-row list of TinyMCE buttons (Visual tab).
                                  *