Changeset 8739

Timestamp:

08/26/2008 10:30:56 PM (18 years ago)

Author:

ryan

Message:

include mysql version in version check query string. Props andy. fixes #7600 for trunk

Location:

trunk/wp-includes

Files:

• update.php (modified) (2 diffs)
• wp-db.php (modified) (3 diffs)

trunk/wp-includes/update.php

@@ -24 +24 @@
                 return;
 
-        global $wp_version;
+        global $wp_version, $wpdb;
         $php_version = phpversion();
 
@@ -41 +41 @@
         $new_option->version_checked = $wp_version;
 
-        $url = "http://api.wordpress.org/core/version-check/1.2/?version=$wp_version&php=$php_version&locale=$locale";
+        if ( method_exists( $wpdb, 'db_version' ) )
+                $mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version($wpdb->users));
+        else
+                $mysql_version = 'N/A';
+
+        $url = "http://api.wordpress.org/core/version-check/1.2/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version";
 
         $options = array('timeout' => 3);

trunk/wp-includes/wp-db.php

@@ -905 +905 @@
                 global $wp_version;
                 // Make sure the server has MySQL 4.0
-                $mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info($this->dbh));
-                if ( version_compare($mysql_version, '4.0.0', '<') )
+                if ( version_compare($this->db_version(), '4.0.0', '<') )
                         return new WP_Error('database_version',sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
         }
@@ -921 +920 @@
         function supports_collation()
         {
-                return ( version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') );
+                return ( version_compare($this->db_version(), '4.1.0', '>=') );
         }
 
@@ -969 +968 @@
         }
 
+        /**
+         * The database version number
+         * @return false|string false on failure, version number on success
+         */
+        function db_version() {
+                return preg_replace('/[^0-9.].*/', '', mysql_get_server_info( $this->dbh ));
+        }
 }