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

Editor: look at the class of the wrapper element instead of `getUserSetting('editor')` to determine the default editor, fixes #27257 

Built from https://develop.svn.wordpress.org/trunk@27364


git-svn-id: http://core.svn.wordpress.org/trunk@27214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-03-02 23:26:13 +00:00
parent cbe89d6710
commit ce7191d2f9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -797,8 +797,7 @@ final class _WP_Editors {
?> ?>
( function() { ( function() {
var init, edId, qtId, firstInit, override, var init, edId, qtId, firstInit, wrapper;
loadMCE = typeof getUserSetting !== 'undefined' ? getUserSetting( 'editor' ) === 'tinymce' : true;
if ( typeof tinymce !== 'undefined' ) { if ( typeof tinymce !== 'undefined' ) {
for ( edId in tinyMCEPreInit.mceInit ) { for ( edId in tinyMCEPreInit.mceInit ) {
@ -808,10 +807,11 @@ final class _WP_Editors {
init = firstInit = tinyMCEPreInit.mceInit[edId]; init = firstInit = tinyMCEPreInit.mceInit[edId];
} }
override = tinymce.DOM.hasClass( tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0], 'tmce-active' ); wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
override = override || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId );
if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
! init.wp_skip_init ) {
if ( ( loadMCE || override ) && ! init.wp_skip_init ) {
try { try {
tinymce.init( init ); tinymce.init( init );