WordPress.org

Make WordPress Core

Changeset 17537


Ignore:
Timestamp:
03/23/11 17:47:20 (4 years ago)
Author:
ryan
Message:

Don't die for failed db connects during install. Props westi. fixes #16640 for 3.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.1/wp-includes/wp-db.php

    r17079 r17537  
    10521052 
    10531053            // If show errors is disabled then we need to die anyway as we don't have a working DB connection 
    1054             // unless we're trying to test the initial connection, in which case setup-config.php will handle. 
    1055             if ( defined( 'WP_SETUP_CONFIG' ) ) 
     1054            // unless we're trying to test the initial connection, in which case setup-config.php/install.php will handle. 
     1055            if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) ) 
    10561056                return; 
    10571057 
Note: See TracChangeset for help on using the changeset viewer.