Changeset 32853

Timestamp:

06/19/2015 03:19:06 AM (10 years ago)

Author:

dd32

Message:

Remove a redundant index drop, it'll be dropped and re-created a few lines further down.
Fixes a warning during updating from 4.0 or earlier.
Merges [32852] to the 4.2 branch. Fixes #31388 for 4.2

File:

• branches/4.2/src/wp-admin/includes/upgrade.php (modified) (1 diff)

branches/4.2/src/wp-admin/includes/upgrade.php

@@ -2458 +2458 @@
     }
 
-    if ( $wp_current_db_version < 30133 ) {
-        // dbDelta() can recreate but can't drop the index.
-        $wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug" );
-    }
-
     // Upgrade versions prior to 4.2.
     if ( $wp_current_db_version < 31351 ) {