Changes in trunk/wp-admin/setup-config.php [14404:16788]

File:

• trunk/wp-admin/setup-config.php (modified) (2 diffs)

trunk/wp-admin/setup-config.php

@@ -43 +43 @@
 require_once(ABSPATH . WPINC . '/compat.php');
 require_once(ABSPATH . WPINC . '/functions.php');
-require_once(ABSPATH . WPINC . '/classes.php');
+require_once(ABSPATH . WPINC . '/class-wp-error.php');
 require_once(ABSPATH . WPINC . '/version.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.