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

When using wp_editor(), make it easier to specify which editor is shown first, fixes #20822 

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


git-svn-id: http://core.svn.wordpress.org/trunk@26965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-02-05 00:34:12 +00:00
parent 9edfc740fd
commit 5ce168941a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ final class _WP_Editors {
$set = wp_parse_args( $settings, array( $set = wp_parse_args( $settings, array(
'wpautop' => true, // use wpautop? 'wpautop' => true, // use wpautop?
'media_buttons' => true, // show insert/upload button(s) 'media_buttons' => true, // show insert/upload button(s)
'default_editor' => '', // When both TinyMCE and Quicktags are used, set which editor is shown on loading the page
'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here 'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here
'textarea_rows' => 20, 'textarea_rows' => 20,
'tabindex' => '', 'tabindex' => '',
@ -100,12 +101,15 @@ final class _WP_Editors {
if ( !current_user_can( 'upload_files' ) ) if ( !current_user_can( 'upload_files' ) )
$set['media_buttons'] = false; $set['media_buttons'] = false;
if ( self::$this_quicktags && self::$this_tinymce ) { if ( ! self::$this_quicktags && self::$this_tinymce ) {
$switch_class = 'html-active'; $switch_class = 'tmce-active';
} elseif ( self::$this_quicktags && self::$this_tinymce ) {
$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
// 'html' and 'switch-html' are used for the "Text" editor tab. // 'html' is used for the "Text" editor tab.
if ( 'html' == wp_default_editor() ) { if ( 'html' === $default_editor ) {
add_filter('the_editor_content', 'wp_htmledit_pre'); add_filter('the_editor_content', 'wp_htmledit_pre');
$switch_class = 'html-active';
} else { } else {
add_filter('the_editor_content', 'wp_richedit_pre'); add_filter('the_editor_content', 'wp_richedit_pre');
$switch_class = 'tmce-active'; $switch_class = 'tmce-active';