From fd1bd360b0569d27b13ff743eccd16b5663d671e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Sep 2022 14:38:05 +0000 Subject: [PATCH] Site Health: Use `$wpdb->db_server_info()` to retrieve database server type. This updates an older fragment in `WP_Site_Health::prepare_sql_data()` to use a dedicated `$wpdb` method introduced later in WordPress 5.5 specifically for retrieving the database server information. Follow-up to [44986], [47451]. Props hilayt24, mukesh27, Clorith, SergeyBiryukov. Fixes #56484. git-svn-id: https://develop.svn.wordpress.org/trunk@54065 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-site-health.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php index 9e6815f180..2714f613f2 100644 --- a/src/wp-admin/includes/class-wp-site-health.php +++ b/src/wp-admin/includes/class-wp-site-health.php @@ -205,13 +205,7 @@ class WP_Site_Health { private function prepare_sql_data() { global $wpdb; - if ( $wpdb->use_mysqli ) { - // phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysqli_get_server_info - $mysql_server_type = mysqli_get_server_info( $wpdb->dbh ); - } else { - // phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysql_get_server_info,PHPCompatibility.Extensions.RemovedExtensions.mysql_DeprecatedRemoved - $mysql_server_type = mysql_get_server_info( $wpdb->dbh ); - } + $mysql_server_type = $wpdb->db_server_info(); $this->mysql_server_version = $wpdb->get_var( 'SELECT VERSION()' );