Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-30 16:17:56 +02:00
Code Issues Projects Releases Wiki Activity

Remove a redundant index drop, it'll be dropped and re-created a few lines further down.

Browse Source 
Fixes a warning during updating from 4.0 or earlier.
Fixes #31388 for trunk

Built from https://develop.svn.wordpress.org/trunk@32852


git-svn-id: http://core.svn.wordpress.org/trunk@32823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-06-19 03:18:26 +00:00
parent 503b80be0b
commit a21f890abb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/upgrade.php
View File

@ -2620,11 +2620,6 @@ function pre_schema_upgrade() {
}
}
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 ) {
if ( ! is_multisite() ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32851';
$wp_version = '4.3-alpha-32852';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.