Changeset 45691

Timestamp:

07/28/2019 02:54:06 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Consistently use wpdb::db_version() for checking the database server version, instead of partically replicating its functionality.

Props Clorith, wpfed.
Fixes #47738.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-debug-data.php (modified) (1 diff)
• class-wp-site-health.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -706 +706 @@
         }
 
-        /*
-         * Check what database engine is used, this will throw compatibility
-         * warnings from PHP compatibility testers, but `mysql_*` is
-         * still valid in PHP 5.6, so we need to account for that.
-         */
-        if ( method_exists( $wpdb, 'db_version' ) ) {
-            if ( $wpdb->use_mysqli ) {
-                // phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysqli_get_server_info
-                $server = mysqli_get_server_info( $wpdb->dbh );
-            } else {
-                // phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysql_get_server_info
-                $server = mysql_get_server_info( $wpdb->dbh );
-            }
-        } else {
-            $server = null;
-        }
+        $server = $wpdb->db_version();
 
         if ( isset( $wpdb->use_mysqli ) && $wpdb->use_mysqli ) {

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -131 +131 @@
             }
 
-            $this->mysql_server_version = $wpdb->get_var( 'SELECT VERSION()' );
+            $this->mysql_server_version = $wpdb->db_version();
         }