Show
Ignore:
Timestamp:
10/30/07 16:49:38 (1 year ago)
Author:
donncha
Message:

Merge with WordPress? 2.3.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/upgrade.php

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