Ticket #27159: 27159.diff

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

@@ -600 +600 @@
                                 $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
                                 $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
                         } else {
-                                $mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+                                $mce_buttons = array( 'formatselect', 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'link', 'unlink', 'wp_more', 'spellchecker' );
 
                                 if ( ! wp_is_mobile() ) {
                                         if ( $set['_content_editor_dfw'] ) {
@@ -622 +622 @@
                                  */
                                 $mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id );
 
-                                $mce_buttons_2 = array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+                                $mce_buttons_2 = array( 'alignleft', 'aligncenter', 'alignright', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
 
                                 if ( ! wp_is_mobile() ) {
                                         $mce_buttons_2[] = 'wp_help';
@@ -690 +690 @@
                                 'toolbar3' => implode($mce_buttons_3, ','),
                                 'toolbar4' => implode($mce_buttons_4, ','),
                                 'tabfocus_elements' => $set['tabfocus_elements'],
-                                'body_class' => $body_class
+                                'body_class' => $body_class,
+                                'block_formats' => 'Paragraph=p;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre;'
                         );
 
                         // Merge with the first part of the init array