From cf9d70f50ab135e3b17eb8b416c0d15ae269e93e Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 10 Dec 2009 20:29:55 +0000 Subject: [PATCH] Drop temp upgrade code. fixes #11266 git-svn-id: https://develop.svn.wordpress.org/trunk@12365 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/upgrade.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index f514199fc5..c38ea8355f 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1712,17 +1712,6 @@ function maybe_disable_automattic_widgets() { function pre_schema_upgrade() { global $wp_current_db_version, $wp_db_version, $wpdb; - // Upgrade 2.9 development versions - if ( ( $wp_current_db_version >= 11557 ) && ( $wp_current_db_version < 12217 ) ) { - // Drop the option_id index. dbDelta() doesn't do the drop. - $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_id"); - - // Drop the old primary key and add the new. - $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)"); - - return; - } - // Upgrade versions prior to 2.9 if ( $wp_current_db_version < 11557 ) { // Delete duplicate options. Keep the option with the highest option_id.