Changeset 47451 for trunk/src/wp-includes/wp-db.php

Timestamp:

03/12/2020 03:53:01 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Database: Introduce wpdb::db_server_info() to retrieve full MySQL server information string as supplied by mysqli_get_server_info().

This complements wpdb::db_version(), which only returns a numeric version string and strips any additional information, e.g. vendor name.

Props clarinetlord, birgire, webaware, pento.
Fixes #40037. See #27703.

File:

• trunk/src/wp-includes/wp-db.php (modified) (2 diffs)

trunk/src/wp-includes/wp-db.php

@@ -3611 +3611 @@
          * @since 2.7.0
          *
-         * @return null|string Null on failure, version number on success.
+         * @return string|null Version number on success, null on failure.
          */
         public function db_version() {
+                return preg_replace( '/[^0-9.].*/', '', $this->db_server_info() );
+        }
+
+        /**
+         * Retrieves full MySQL server information.
+         *
+         * @since 5.5.0
+         *
+         * @return string|false Server info on success, false on failure.
+         */
+        public function db_server_info() {
                 if ( $this->use_mysqli ) {
                         $server_info = mysqli_get_server_info( $this->dbh );
@@ -3619 +3630 @@
                         $server_info = mysql_get_server_info( $this->dbh );
                 }
-                return preg_replace( '/[^0-9.].*/', '', $server_info );
+
+                return $server_info;
         }
 }