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

Remove some old backwards compatilibity code from TinyMCE. 

Props azaozz.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-04-20 05:50:27 +00:00
parent f32bbeeb95
commit 168729cb0d
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,12 +117,6 @@ final class _WP_Editors {
// A cookie (set when a user resizes the editor) overrides the height. // A cookie (set when a user resizes the editor) overrides the height.
$cookie = (int) get_user_setting( 'ed_size' ); $cookie = (int) get_user_setting( 'ed_size' );
// Upgrade an old TinyMCE cookie if it is still around, and the new one isn't.
if ( ! $cookie && isset( $_COOKIE['TinyMCE_content_size'] ) ) {
parse_str( $_COOKIE['TinyMCE_content_size'], $cookie );
$cookie = $cookie['ch'];
}
if ( $cookie ) if ( $cookie )
$set['editor_height'] = $cookie; $set['editor_height'] = $cookie;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-RC1-32164'; $wp_version = '4.2-RC1-32166';
/** /**
* 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.