IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editor: fix warnings in class-wp-editor.php, see #30453.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@30583


git-svn-id: http://core.svn.wordpress.org/trunk@30573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-11-26 23:04:21 +00:00
parent 1d3b040d7d
commit 4855f36478
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,20 +76,21 @@ final class _WP_Editors {
$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id ); $settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
$set = wp_parse_args( $settings, array( $set = wp_parse_args( $settings, array(
'wpautop' => true, 'wpautop' => true,
'media_buttons' => true, 'media_buttons' => true,
'default_editor' => '', 'default_editor' => '',
'drag_drop_upload' => false, 'drag_drop_upload' => false,
'textarea_name' => $editor_id, 'textarea_name' => $editor_id,
'textarea_rows' => 20, 'textarea_rows' => 20,
'tabindex' => '', 'tabindex' => '',
'tabfocus_elements' => ':prev,:next', 'tabfocus_elements' => ':prev,:next',
'editor_css' => '', 'editor_css' => '',
'editor_class' => '', 'editor_class' => '',
'teeny' => false, 'teeny' => false,
'dfw' => false, 'dfw' => false,
'tinymce' => true, '_content_editor_dfw' => false,
'quicktags' => true 'tinymce' => true,
'quicktags' => true
) ); ) );
self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() ); self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30582'; $wp_version = '4.1-beta2-30583';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.