Changeset 27364 for trunk/src/wp-includes/class-wp-editor.php

Timestamp:

03/02/2014 11:25:25 PM (12 years ago)

Author:

azaozz

Message:

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

File:

• trunk/src/wp-includes/class-wp-editor.php (modified) (2 diffs)

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

@@ -798 +798 @@
 
         ( function() {
-            var init, edId, qtId, firstInit, override,
-                loadMCE = typeof getUserSetting !== 'undefined' ? getUserSetting( 'editor' ) === 'tinymce' : true;
+            var init, edId, qtId, firstInit, wrapper;
 
             if ( typeof tinymce !== 'undefined' ) {
@@ -809 +808 @@
                     }
 
-                    override = tinymce.DOM.hasClass( tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0], 'tmce-active' );
-                    override = override || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId );
-
-                    if ( ( loadMCE || override ) && ! init.wp_skip_init ) {
+                    wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
+
+                    if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
+                        ! init.wp_skip_init ) {
+
                         try {
                             tinymce.init( init );