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

Upgrade: Skip the sitecategories table when it doesn't exist (Global Terms is disabled). 

Props nofearinc, obenland, SergeyBiryukov, and pento.
Fixes #33206

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


git-svn-id: http://core.svn.wordpress.org/trunk@33564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-08-09 02:22:26 +00:00
parent 04c21a0e3c
commit e2b10dad49
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1685,6 +1685,11 @@ function upgrade_network() {
$tables = $wpdb->tables( 'global' );
// sitecategories may not exist.
if ( ! $this->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
unset( $tables['sitecategories'] );
}
foreach ( $tables as $table ) {
maybe_convert_table_to_utf8mb4( $table );
}
@ -1709,6 +1714,11 @@ function upgrade_network() {
$tables = $wpdb->tables( 'global' );
// sitecategories may not exist.
if ( ! $this->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
unset( $tables['sitecategories'] );
}
foreach ( $tables as $table ) {
maybe_convert_table_to_utf8mb4( $table );
}

2
wp-includes/version.php
View File

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