From f679a75b0cd431c4bd099766d8d0c794f09ac28c Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 23 Mar 2011 17:46:40 +0000 Subject: [PATCH] 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 --- wp-includes/wp-db.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index e9b4e6fb1..f075c5655 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -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();