Make WordPress Core

Changeset 17546


Ignore:
Timestamp:
03/23/2011 07:57:35 PM (14 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/wp-db.php

    r17538 r17546  
    10491049"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
    10501050
    1051             // If show errors is disabled then we need to die anyway as we don't have a working DB connection
    1052             // unless we're trying to test the initial connection, in which case setup-config.php/install.php will handle.
    1053             if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) )
    1054                 return;
    1055 
    1056             die();
     1051            return;
    10571052        }
    10581053
Note: See TracChangeset for help on using the changeset viewer.