<!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>[17547] branches/3.1/wp-includes/wp-db.php: Don't die inside db_connect()
  if connection fails.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17547">17547</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-03-23 19:58:03 +0000 (Wed, 23 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't die inside db_connect() if connection fails.  Let dead_db() handle it. fixes <a href="http://trac.wordpress.org/ticket/16640">#16640</a> for 3.1</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludeswpdbphp">branches/3.1/wp-includes/wp-db.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/wp-db.php (17546 => 17547)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/wp-db.php        2011-03-23 19:57:35 UTC (rev 17546)
+++ branches/3.1/wp-includes/wp-db.php        2011-03-23 19:58:03 UTC (rev 17547)
</span><span class="lines">@@ -1050,12 +1050,7 @@
</span><span class="cx"> &lt;p&gt;If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the &lt;a href='http://wordpress.org/support/'&gt;WordPress Support Forums&lt;/a&gt;.&lt;/p&gt;
</span><span class="cx"> &quot;/*/WP_I18N_DB_CONN_ERROR*/, $this-&gt;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
-                        // unless we're trying to test the initial connection, in which case setup-config.php/install.php will handle.
-                        if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) )
-                                return;
-
-                        die();
</del><ins>+                        return;
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 $this-&gt;set_charset( $this-&gt;dbh );
</span></span></pre>
</div>
</div>

</body>
</html>