diff --git wp-admin/includes/upgrade.php wp-admin/includes/upgrade.php
index f13c458..7d30931 100644
|
|
function upgrade_network() { |
1685 | 1685 | |
1686 | 1686 | $tables = $wpdb->tables( 'global' ); |
1687 | 1687 | |
| 1688 | // Sitecategories may not exist if global terms are disabled. |
| 1689 | if ( is_multisite() && ! global_terms_enabled() ) |
| 1690 | unset( $tables['sitecategories'] ); |
| 1691 | |
1688 | 1692 | foreach ( $tables as $table ) { |
1689 | 1693 | maybe_convert_table_to_utf8mb4( $table ); |
1690 | 1694 | } |
… |
… |
function upgrade_network() { |
1709 | 1713 | |
1710 | 1714 | $tables = $wpdb->tables( 'global' ); |
1711 | 1715 | |
| 1716 | // Sitecategories may not exist if global terms are disabled. |
| 1717 | if ( is_multisite() && ! global_terms_enabled() ) |
| 1718 | unset( $tables['sitecategories'] ); |
| 1719 | |
1712 | 1720 | foreach ( $tables as $table ) { |
1713 | 1721 | maybe_convert_table_to_utf8mb4( $table ); |
1714 | 1722 | } |