Changeset 6199

Timestamp:

10/06/2007 08:40:54 AM (18 years ago)

Author:

westi

Message:

Move all calls to mysql_ functions to withiWPDB so that t we don't expect any mysql stuff when we are using a custo$wpdb class. Fixes #5127
props ComputerGuru.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -4 +4 @@
 $charset_collate = '';
 
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+if ( $wpdb->supports_collation() ) {
     if ( ! empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";

trunk/wp-admin/includes/upgrade.php

@@ -1240 +1240 @@
 
 function wp_check_mysql_version() {
-    global $wp_version;
-
-    // Make sure the server has MySQL 4.0
-    $mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info());
-    if ( version_compare($mysql_version, '4.0.0', '<') )
-        die(sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
+    global $wpdb;
+    $result = $wpdb->check_database_version();
+    if ( is_wp_error( $result ) )
+        die( $result->get_error_message() );
 }
 

trunk/wp-includes/wp-db.php

@@ -404 +404 @@
         wp_die($message);
     }
+    /**
+     * Checks wether of not the database version is high enough to support the features WordPress uses
+     * @global $wp_version
+     */
+    function check_database_version()
+    {
+        global $wp_version;
+        // Make sure the server has MySQL 4.0
+        $mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info());
+        if ( version_compare($mysql_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));
+    }
+
+    /**
+     * This function is called when WordPress is generating the table schema to determine wether or not the current database
+     * supports or needs the collation statements.
+     */
+    function supports_collation()
+    {
+        return ( version_compare(mysql_get_server_info(), '4.1.0', '>=') );
+    }
 }