Ticket #30187: class-wp-editor.php.diff

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

@@ -50 +50 @@
          *     @type string     $editor_css        Intended for extra styles for both Visual and Text editors.
          *                                         Should include <style> tags, and can use "scoped". Default empty.
          *     @type string     $editor_class      Extra classes to add to the editor textarea elemen. Default empty.
+         *     @type bool       $theme_styles      Whether to add theme editor styles. Default true.
          *     @type bool       $teeny             Whether to output the minimal editor config. Examples include
          *                                         Press This and the Comment editor. Default false.
          *     @type bool       $dfw               Whether to replace the default fullscreen with "Distraction Free
@@ -86 +87 @@
                         'tabfocus_elements' => ':prev,:next',
                         'editor_css'        => '',
                         'editor_class'      => '',
+                        'theme_styles'      => true,
                         'teeny'             => false,
                         'dfw'               => false,
                         'tinymce'           => true,
@@ -177 +179 @@
                                 $switch_class = 'tmce-active';
                         }
 
-                        $buttons .= '<button type="button" id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</button>\n";
-                        $buttons .= '<button type="button" id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
+                        $buttons .= '<a id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</a>\n";
+                        $buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n";
                 }
 
                 $wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
@@ -489 +491 @@
                                         'entities' => '38,amp,60,lt,62,gt',
                                         'entity_encoding' => 'raw',
                                         'keep_styles' => false,
-                                        'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'],
 
                                         // Limit the preview styles in the menu/toolbar
                                         'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
@@ -513 +514 @@
                                         self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
                                 );
 
-                                $editor_styles = get_editor_stylesheets();
-                                if ( ! empty( $editor_styles ) ) {
-                                        foreach ( $editor_styles as $style ) {
-                                                $mce_css[] = $style;
+                                if ( $set['theme_styles'] ) {
+                                        $editor_styles = get_editor_stylesheets();
+                                        if ( ! empty( $editor_styles ) ) {
+                                                foreach ( $editor_styles as $style ) {
+                                                        $mce_css[] = $style;
+                                                }
                                         }
                                 }
+                                
 
                                 /**
                                  * Filter the comma-delimited list of stylesheets to load in TinyMCE.
@@ -601 +605 @@
                                 }
                         }
 
-                        $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
-
                         if ( !empty($set['tinymce']['body_class']) ) {
                                 $body_class .= ' ' . $set['tinymce']['body_class'];
                                 unset($set['tinymce']['body_class']);
@@ -1433 +1435 @@
                 </div>
                 <?php
         }
-}
+}
+ No newline at end of file