WordPress.org

Make WordPress Core

Changeset 16788


Ignore:
Timestamp:
12/08/10 07:12:44 (3 years ago)
Author:
nacin
Message:

Don't improperly whitescreen on incorrect DB credentials during setup-config. Show error message with an opportunity to try again. fixes #15682.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/setup-config.php

    r16099 r16788  
    177177    // We'll fail here if the values are no good. 
    178178    require_wp_db(); 
    179     if ( !empty($wpdb->error) ) 
    180         wp_die($wpdb->error->get_error_message()); 
     179    if ( ! empty( $wpdb->error ) ) { 
     180        $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">Try Again</a></p>'; 
     181        wp_die( $wpdb->error->get_error_message() . $back ); 
     182    } 
    181183 
    182184    // Fetch or generate keys and salts. 
  • trunk/wp-includes/wp-db.php

    r16660 r16788  
    10451045"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); 
    10461046 
    1047             //If show errors is disabled then we need to die anyway as we don't have a working DB connection 
     1047            // If show errors is disabled then we need to die anyway as we don't have a working DB connection 
     1048            // unless we're trying to test the initial connection, in which case setup-config.php will handle. 
     1049            if ( defined( 'WP_SETUP_CONFIG' ) ) 
     1050                return; 
     1051 
    10481052            die(); 
    10491053        } 
Note: See TracChangeset for help on using the changeset viewer.