WordPress.org

Make WordPress Core

Changeset 17547


Ignore:
Timestamp:
03/23/11 19:58:03 (4 years ago)
Author:
ryan
Message:

Don't die inside db_connect() if connection fails. Let dead_db() handle it. fixes #16640 for 3.1

File:
1 edited

Legend:

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

    r17537 r17547  
    10511051"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); 
    10521052 
    1053             // 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/install.php will handle. 
    1055             if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) ) 
    1056                 return; 
    1057  
    1058             die(); 
     1053            return; 
    10591054        } 
    10601055 
Note: See TracChangeset for help on using the changeset viewer.