<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16788] trunk: Don'
t improperly whitescreen on incorrect DB credentials during setup-config.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16788">16788</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-08 07:12:44 +0000 (Wed, 08 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't improperly whitescreen on incorrect DB credentials during setup-config. Show error message with an opportunity to try again. fixes <a href="http://trac.wordpress.org/ticket/15682">#15682</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (16787 => 16788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-12-08 07:02:52 UTC (rev 16787)
+++ trunk/wp-admin/setup-config.php 2010-12-08 07:12:44 UTC (rev 16788)
</span><span class="lines">@@ -176,8 +176,10 @@
</span><span class="cx">
</span><span class="cx"> // We'll fail here if the values are no good.
</span><span class="cx"> require_wp_db();
</span><del>- if ( !empty($wpdb->error) )
- wp_die($wpdb->error->get_error_message());
</del><ins>+ 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 );
+ }
</ins><span class="cx">
</span><span class="cx"> // Fetch or generate keys and salts.
</span><span class="cx"> $no_api = isset( $_POST['noapi'] );
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (16787 => 16788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-12-08 07:02:52 UTC (rev 16787)
+++ trunk/wp-includes/wp-db.php 2010-12-08 07:12:44 UTC (rev 16788)
</span><span class="lines">@@ -1044,7 +1044,11 @@
</span><span class="cx"> <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
</span><span class="cx"> "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
</span><span class="cx">
</span><del>- //If show errors is disabled then we need to die anyway as we don't have a working DB connection
</del><ins>+ // 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;
+
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>