Ticket #15682: 15682.diff

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 ( defined( 'WP_SETUP_CONFIG' ) )
+                                return;
+
                         die();
                 }
 

wp-admin/setup-config.php

@@ -176 +176 @@
 
         // 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.
         $no_api = isset( $_POST['noapi'] );