Drop temp upgrade code. fixes #11266
git-svn-id: http://svn.automattic.com/wordpress/trunk@12365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2a42d27a22
commit
c7e8399e1d
|
@ -1712,17 +1712,6 @@ function maybe_disable_automattic_widgets() {
|
||||||
function pre_schema_upgrade() {
|
function pre_schema_upgrade() {
|
||||||
global $wp_current_db_version, $wp_db_version, $wpdb;
|
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
|
// Upgrade versions prior to 2.9
|
||||||
if ( $wp_current_db_version < 11557 ) {
|
if ( $wp_current_db_version < 11557 ) {
|
||||||
// Delete duplicate options. Keep the option with the highest option_id.
|
// Delete duplicate options. Keep the option with the highest option_id.
|
||||||
|
|
Loading…
Reference in New Issue