golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
ryan 2011-03-23 17:46:40 +00:00
parent 9fec2e59dc
commit f679a75b0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/wp-db.php
View File

@ -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();