Make WordPress Core

Changeset 19060


Ignore:
Timestamp:
10/25/2011 05:29:28 AM (13 years ago)
Author:
nacin
Message:

Introduce ->mysql to allow drop-ins to declare themselves as MySQL and therefore allow minimum version checks to still apply. fixes #18176.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/update-core.php

    r18938 r19060  
    338338    $wp_version = '3.3';
    339339    $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
    340     $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
     340    if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $this->is_mysql ) )
     341        $mysql_compat = true;
     342    else
     343        $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
    341344
    342345    if ( !$mysql_compat || !$php_compat )
  • trunk/wp-admin/update-core.php

    r19054 r19060  
    4545            $form_action = 'update-core.php?action=do-core-reinstall';
    4646        } else {
    47             $php_compat     = version_compare( $php_version, $update->php_version, '>=' );
    48             $mysql_compat   = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
     47            $php_compat     = version_compare( $php_version, $update->php_version, '>=' );         
     48            if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
     49                $mysql_compat = true;
     50            else
     51                $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
     52
    4953            if ( !$mysql_compat && !$php_compat )
    5054                $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
  • trunk/wp-admin/upgrade.php

    r18460 r19060  
    3939$mysql_version  = $wpdb->db_version();
    4040$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
    41 $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
     41if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
     42    $mysql_compat = true;
     43else
     44    $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
    4245
    4346@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
  • trunk/wp-includes/wp-db.php

    r18998 r19060  
    460460     */
    461461    var $func_call;
     462
     463    /**
     464     * Whether MySQL is used as the database engine.
     465     *
     466     * Set in WPDB::db_connect() to true, by default. This is used when checking
     467     * against the required MySQL version for WordPress. Normally, a replacement
     468     * database drop-in (db.php) will skip these checks, but setting this to true
     469     * will force the checks to occur.
     470     *
     471     * @since 3.3.0
     472     * @access public
     473     * @var bool
     474     */
     475    public $is_mysql = null;
    462476
    463477    /**
     
    10161030     */
    10171031    function db_connect() {
     1032
     1033        $this->is_mysql = true;
     1034
    10181035        if ( WP_DEBUG ) {
    10191036            $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
Note: See TracChangeset for help on using the changeset viewer.