WordPress.org

Make WordPress Core

Ticket #16640: 16640-fix.diff

File 16640-fix.diff, 729 bytes (added by westi, 3 years ago)
  • wp-includes/wp-db.php

     
    10511051"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); 
    10521052 
    10531053                        // 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 will handle. 
    1055                         if ( defined( 'WP_SETUP_CONFIG' ) ) 
     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' ) ) 
    10561056                                return; 
    10571057 
    10581058                        die();