Ticket #33206: 33206.4.diff

src/wp-admin/includes/upgrade.php

@@ -1685 +1685 @@
 
                         $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 ) {
                                 maybe_convert_table_to_utf8mb4( $table );
                         }