Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
azaozz 2011-12-01 21:27:19 +00:00
parent de11d4cb22
commit f8d2a35aaa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-editor.php
View File

@ -535,6 +535,9 @@ final class _WP_Editors {
var init, ed, qt, first_init, mce = <?php echo wp_default_editor() == 'tinymce' ? 'true' : 'false'; ?>;
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] );

3
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css
View File

@ -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");