<!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>[15808] trunk/wp-includes/wp-db.php:
Display mysql_connect errors when WP_DEBUG is enabled.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15808">15808</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-10-14 18:47:39 +0000 (Thu, 14 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display mysql_connect errors when WP_DEBUG is enabled. Fixes <a href="http://trac.wordpress.org/ticket/14654">#14654</a> props lloydbudd and hakre
Always die if we can't connect to the db no point in going any futher.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (15807 => 15808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-10-14 18:37:08 UTC (rev 15807)
+++ trunk/wp-includes/wp-db.php 2010-10-14 18:47:39 UTC (rev 15808)
</span><span class="lines">@@ -1026,7 +1026,11 @@
</span><span class="cx"> function db_connect() {
</span><span class="cx"> global $db_list, $global_db_list;
</span><span class="cx">
</span><del>- $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
</del><ins>+ if ( WP_DEBUG ) {
+ $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+ } else {
+ $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( !$this->dbh ) {
</span><span class="cx"> $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
</span><span class="lines">@@ -1039,6 +1043,9 @@
</span><span class="cx"> </ul>
</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><ins>+
+ //If show errors is disabled then we need to die anyway as we don't have a working DB connection
+ die();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->set_charset( $this->dbh );
</span></span></pre>
</div>
</div>
</body>
</html>