WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multisite blogs table: Convert the archived field from enum to tinyint to match the other status fields. fixes #12832. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@25369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-09-15 23:12:11 +00:00
parent d39f430f64
commit 6931079cec
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/schema.php
View File

@ -230,7 +230,7 @@ CREATE TABLE $wpdb->posts (
registered datetime NOT NULL default '0000-00-00 00:00:00', registered datetime NOT NULL default '0000-00-00 00:00:00',
last_updated datetime NOT NULL default '0000-00-00 00:00:00', last_updated datetime NOT NULL default '0000-00-00 00:00:00',
public tinyint(2) NOT NULL default '1', public tinyint(2) NOT NULL default '1',
archived enum('0','1') NOT NULL default '0', archived tinyint(2) NOT NULL default '0',
mature tinyint(2) NOT NULL default '0', mature tinyint(2) NOT NULL default '0',
spam tinyint(2) NOT NULL default '0', spam tinyint(2) NOT NULL default '0',
deleted tinyint(2) NOT NULL default '0', deleted tinyint(2) NOT NULL default '0',

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

@ -1978,11 +1978,22 @@ function pre_schema_upgrade() {
$wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name"); $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
} }
// Multisite schema upgrades.
if ( $wp_current_db_version < 25448 && is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && is_main_network() ) {
// Upgrade verions prior to 3.7 // Upgrade verions prior to 3.7
if ( $wp_current_db_version < 25179 && is_multisite() && is_main_network() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { if ( $wp_current_db_version < 25179 ) {
// New primary key for signups.
$wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" ); $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" ); $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
} }
if ( $wp_current_db_version < 25448 ) {
// Convert archived from enum to tinyint.
$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
}
}
} }
/** /**

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.7-alpha-25343';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 25416; $wp_db_version = 25448;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version