From 1b949ded14fae5f323804f45aa068f08f7520182 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 24 Feb 2023 15:08:26 +0000 Subject: [PATCH] Database: Remove the check for `sitecategories` table on Database Repair screen. The table is no longer created by core as of WordPress 3.0, and support for global terms was removed in WordPress 6.1, so `$wpdb->sitecategories` is unset by default. This commit resolves a "passing null to non-nullable" deprecation notice on PHP 8.1: {{{ Deprecated: addcslashes(): Passing null to parameter #1 ($string) of type string is deprecated in wp-includes/class-wpdb.php on line 1804 }}} The `tables_to_repair` filter is available for plugins to readd the table or include any additional tables to repair. Follow-up to [14854], [14880], [54240]. Props ipajen, chiragrathod103, SergeyBiryukov. Fixes #57762. git-svn-id: https://develop.svn.wordpress.org/trunk@55421 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/maint/repair.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/wp-admin/maint/repair.php b/src/wp-admin/maint/repair.php index 30d015bab2..1821334e38 100644 --- a/src/wp-admin/maint/repair.php +++ b/src/wp-admin/maint/repair.php @@ -97,12 +97,6 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) { $tables = $wpdb->tables(); - // Sitecategories may not exist if global terms are disabled. - $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->sitecategories ) ); - if ( is_multisite() && ! $wpdb->get_var( $query ) ) { - unset( $tables['sitecategories'] ); - } - /** * Filters additional database tables to repair. *