Changeset 33597

Timestamp:

08/09/2015 02:21:11 AM (9 years ago)

Author:

dd32

Message:

Upgrade: Skip the sitecategories table when it doesn't exist (Global Terms is disabled).
Props nofearinc, obenland, SergeyBiryukov, and pento.
Fixes #33206

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -1686 +1686 @@
             $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 +1714 @@
 
             $tables = $wpdb->tables( 'global' );
+
+            // sitecategories may not exist.
+            if ( ! $this->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
+                unset( $tables['sitecategories'] );
+            }
 
             foreach ( $tables as $table ) {