From f8d2a35aaa2dfcf757b5b09c2fde3f03d7011f18 Mon Sep 17 00:00:00 2001 From: azaozz Date: Thu, 1 Dec 2011 21:27:19 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.automattic.com/wordpress/trunk@19533 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-editor.php | 3 +++ wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index e28cd8c8f..a272eb7ef 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -535,6 +535,9 @@ final class _WP_Editors { var init, ed, qt, first_init, mce = ; 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 ) { init = tinyMCEPreInit.mceInit[ed] = tinymce.extend( {}, first_init, tinyMCEPreInit.mceInit[ed] ); diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css index c41057f8c..2097708f0 100644 --- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css +++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css @@ -1 +1,2 @@ -/* 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");