Don't die for failed db connects during install. Props westi. fixes #16640 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@17536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9fec2e59dc
commit
f679a75b0c
|
@ -1051,8 +1051,8 @@ class wpdb {
|
|||
"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
|
||||
|
||||
// If show errors is disabled then we need to die anyway as we don't have a working DB connection
|
||||
// unless we're trying to test the initial connection, in which case setup-config.php will handle.
|
||||
if ( defined( 'WP_SETUP_CONFIG' ) )
|
||||
// unless we're trying to test the initial connection, in which case setup-config.php/install.php will handle.
|
||||
if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) )
|
||||
return;
|
||||
|
||||
die();
|
||||
|
|
Loading…
Reference in New Issue