Changeset 16788

Timestamp:

12/08/2010 07:12:44 AM (14 years ago)

Author:

nacin

Message:

Don't improperly whitescreen on incorrect DB credentials during setup-config. Show error message with an opportunity to try again. fixes #15682.

Location:

trunk

Files:

• wp-admin/setup-config.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/setup-config.php

@@ -177 +177 @@
     // We'll fail here if the values are no good.
     require_wp_db();
-    if ( !empty($wpdb->error) )
-        wp_die($wpdb->error->get_error_message());
+    if ( ! empty( $wpdb->error ) ) {
+        $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">Try Again</a></p>';
+        wp_die( $wpdb->error->get_error_message() . $back );
+    }
 
     // Fetch or generate keys and salts.

trunk/wp-includes/wp-db.php

@@ -1045 +1045 @@
 "/*/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
+            // 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' ) )
+                return;
+
             die();
         }