sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix database schema update introduced in [30121].

Browse Source 
The index must be manually dropped before `dbDelta()` can add the new index
without throwing a notice.

Fixes #22023.

git-svn-id: https://develop.svn.wordpress.org/trunk@30134 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2014-11-01 01:10:04 +00:00
parent ff4f545fc9
commit 086f2b9dbd
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wp-admin/includes/upgrade.php
View File

@ -442,9 +442,6 @@ function upgrade_all() {
if ( $wp_current_db_version < 29630 ) if ( $wp_current_db_version < 29630 )
upgrade_400(); upgrade_400();
if ( $wp_current_db_version < 30056 )
upgrade_410();
maybe_disable_link_manager(); maybe_disable_link_manager();
maybe_disable_automattic_widgets(); maybe_disable_automattic_widgets();
@ -1331,18 +1328,6 @@ function upgrade_400() {
} }
} }
/**
* Execute changes made in WordPress 4.1.0.
*
* @since 4.1.0
*/
function upgrade_410() {
global $wp_current_db_version, $wpdb;
if ( $wp_current_db_version < 30056 ) {
add_clean_index( $wpdb->terms, 'slug' );
}
}
/** /**
* Execute network level changes * Execute network level changes
* *
@ -2205,6 +2190,11 @@ function pre_schema_upgrade() {
$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" ); $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
} }
} }
if ( $wp_current_db_version < 30133 ) {
// dbDelta() can recreate but can't drop the index.
$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug" );
}
} }
/** /**

2
src/wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '4.1-alpha-30000-src';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 30056; $wp_db_version = 30133;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version