From 02be42f58d0eda4b5867a2beb3bb092200aae1c5 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 10 Jun 2010 14:41:51 +0000
Subject: [PATCH] Remove old hidden columns usermeta keys.  fixes #13783

git-svn-id: http://svn.automattic.com/wordpress/trunk@15187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php | 9 +++++----
 wp-includes/version.php       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index a8377a10e..d869cc2c6 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -440,7 +440,7 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 11958 )
 		upgrade_290();
 
-	if ( $wp_current_db_version < 15093 )
+	if ( $wp_current_db_version < 15187 )
 		upgrade_300();
 
 	maybe_disable_automattic_widgets();
@@ -1129,10 +1129,11 @@ function upgrade_300() {
 	if ( $wp_current_db_version >= 13802 && $wp_current_db_version < 13974 )
 		$wpdb->update( $wpdb->postmeta, array( 'meta_value' => '' ), array( 'meta_key' => '_menu_item_target', 'meta_value' => '_self' ) );
 
-	// 3.0-beta metabox changes. can be removed before release (except metaboxorder). // r13551
-	if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14726 ) {
+	// 3.0 screen options key name changes.
+	if ( !is_multisite() || is_main_site() ) {
 		$prefix = like_escape($wpdb->base_prefix);
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'" );
+		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
+					 OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden'" );
 	}
 
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b5b24da63..3e40b0f1d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -15,7 +15,7 @@ $wp_version = '3.0-RC2-15182';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 15093;
+$wp_db_version = 15187;
 
 /**
  * Holds the TinyMCE version