From c61dc4110129113ad449f86ac9cbd917742db8b6 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Tue, 18 May 2010 15:30:05 +0000
Subject: [PATCH] Remove old metaboxorder settings. see #13424

git-svn-id: https://develop.svn.wordpress.org/trunk@14726 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/upgrade.php | 8 ++++----
 wp-includes/version.php       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 661bf8cf51..b338112068 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 < 14595 )
+	if ( $wp_current_db_version < 14726 )
 		upgrade_300();
 
 	maybe_disable_automattic_widgets();
@@ -1135,10 +1135,10 @@ 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. // r13551
-	if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14595 ) {
+	// 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 ) {
 		$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}%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%'" );
 	}
 
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 984b221477..ea93707516 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -15,7 +15,7 @@ $wp_version = '3.0-beta2-14697';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 14651;
+$wp_db_version = 14726;
 
 /**
  * Holds the TinyMCE version