Changeset 19533

Timestamp:

12/01/2011 09:27:19 PM (13 years ago)

Author:

azaozz

Message:

Make sure editor-buttons.css is loaded even if tiny_mce.js is used directly and the wp_theme skin is selected in the settings, see #17144

Location:

trunk/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/themes/advanced/skins/wp_theme/ui.css (modified) (1 diff)

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

@@ -536 +536 @@
 
             if ( typeof(tinymce) == 'object' ) {
+                // mark wp_theme/ui.css as loaded
+                tinymce.DOM.files[tinymce.baseURI.getURI() + '/themes/advanced/skins/wp_theme/ui.css'] = true;
+
                 for ( ed in tinyMCEPreInit.mceInit ) {
                     if ( first_init ) {

trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css

@@ -1 @@
-/* not used but cannot prevent TinyMCE loading it (for now) */
+/* not used, included for back-compat, see wp-includes/css/editor-buttons.css */
+@import url("../../../../../../css/editor-buttons.css?ver=20111114");