From ff88489bdcb3403a212f9d918d83e9cf5f9fe568 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 26 Sep 2012 03:17:28 +0000
Subject: [PATCH] Remove the 'Size of the post box' (default_post_edit_rows)
 option. This will instead be handled by a user cookie tracking the resizing
 of both TinyMCE and the main textarea. see #21718.

git-svn-id: https://develop.svn.wordpress.org/trunk@22006 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/schema.php | 3 +--
 wp-admin/options-writing.php | 5 -----
 wp-admin/options.php         | 2 +-
 wp-includes/formatting.php   | 1 -
 wp-includes/version.php      | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index d3468f580b..d70790b149 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -377,7 +377,6 @@ function populate_options() {
 	'default_comment_status' => 'open',
 	'default_ping_status' => 'open',
 	'default_pingback_flag' => 1,
-	'default_post_edit_rows' => 20,
 	'posts_per_page' => 10,
 	/* translators: default date format, see http://php.net/date */
 	'date_format' => __('F j, Y'),
@@ -537,7 +536,7 @@ function populate_options() {
 		'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron',
 		'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page',
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
-		'autoembed_urls',
+		'autoembed_urls', 'default_post_edit_rows',
 	);
 	foreach ( $unusedoptions as $option )
 		delete_option($option);
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 42ed2833da..e7a24aa6fc 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -70,11 +70,6 @@ include('./admin-header.php');
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></th>
-<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" class="small-text" />
-<?php _e('lines') ?></td>
-</tr>
-<tr valign="top">
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
 <label for="use_smilies">
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 53f7e106c5..92ae917bf7 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -63,7 +63,7 @@ $whitelist_options = array(
 	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
 	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
 	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-	'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
+	'writing' => array( 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index a73a8ada49..b1cb53480b 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2764,7 +2764,6 @@ function sanitize_option($option, $value) {
 		case 'medium_size_h':
 		case 'large_size_w':
 		case 'large_size_h':
-		case 'default_post_edit_rows':
 		case 'mailserver_port':
 		case 'comment_max_links':
 		case 'page_on_front':
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ce51b3ebc7..5d35324c6b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '3.5-alpha-21989';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 21998;
+$wp_db_version = 22006;
 
 /**
  * Holds the TinyMCE version