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

TinyMCE: fix initializing TinyMCE when the default editor in getUserSetting() is overridden from PHP by using the 'wp_default_editor' filter. See #24067. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@26881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-01-22 18:17:12 +00:00
parent 97afd9c251
commit 167235a602
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,7 +796,7 @@ final class _WP_Editors {
?>
( function() {
var init, edId, qtId, firstInit,
var init, edId, qtId, firstInit, override,
loadMCE = typeof getUserSetting !== 'undefined' ? getUserSetting( 'editor' ) === 'tinymce' : true;
if ( typeof quicktags !== 'undefined' ) {
@ -813,7 +813,10 @@ final class _WP_Editors {
init = firstInit = tinyMCEPreInit.mceInit[edId];
}
if ( ( loadMCE || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) && ! init.wp_skip_init ) {
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 ) {
try { tinymce.init( init ); } catch(e){}
}
}