WordPress 4.1.2

[autoinstalls/wordpress.git] / wp-includes / class-wp-editor.php

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 521c0ee67b93f7163a14197a79df2d26cdc2e611..6148583d0c2b4262143dc281d3eb173a3c6f3361 100644 (file)
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -117,12 +117,6 @@ final class _WP_Editors {
                        // A cookie (set when a user resizes the editor) overrides the height.
                        $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 )
                                $set['editor_height'] = $cookie;
                }