<!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>[13327] trunk/wp-includes/wp-db.php: Use sprintf() in hard-coded string.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13327">13327</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-23 09:44:27 +0000 (Tue, 23 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use sprintf() in hard-coded string. Use same comment and error code as other identical message. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a> props hakre</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 (13326 => 13327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php        2010-02-23 09:15:47 UTC (rev 13326)
+++ trunk/wp-includes/wp-db.php        2010-02-23 09:44:27 UTC (rev 13327)
</span><span class="lines">@@ -989,16 +989,16 @@
</span><span class="cx">                 $dbhname = &quot;dbh&quot; . $action;
</span><span class="cx">                 $this-&gt;$dbhname = @mysql_connect( $details[ 'db_host' ], $details[ 'db_user' ], $details[ 'db_password' ] );
</span><span class="cx">                 if (!$this-&gt;$dbhname ) {
</span><del>-                        $this-&gt;bail(/*WP_I18N_DB_CONNECT_DB*/&quot;
</del><ins>+                        $this-&gt;bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/&quot;
</ins><span class="cx"> &lt;h1&gt;Error establishing a database connection&lt;/h1&gt;
</span><del>-&lt;p&gt;This either means that the username and password information in your &lt;code&gt;wp-config.php&lt;/code&gt; file is incorrect or we can't contact the database server at &lt;code&gt;{$details['db_host']}&lt;/code&gt;. This could mean your host's database server is down.&lt;/p&gt;
</del><ins>+&lt;p&gt;This either means that the username and password information in your &lt;code&gt;wp-config.php&lt;/code&gt; file is incorrect or we can't contact the database server at &lt;code&gt;%s&lt;/code&gt;. This could mean your host's database server is down.&lt;/p&gt;
</ins><span class="cx"> &lt;ul&gt;
</span><span class="cx">         &lt;li&gt;Are you sure you have the correct username and password?&lt;/li&gt;
</span><span class="cx">         &lt;li&gt;Are you sure that you have typed the correct hostname?&lt;/li&gt;
</span><span class="cx">         &lt;li&gt;Are you sure that the database server is running?&lt;/li&gt;
</span><span class="cx"> &lt;/ul&gt;
</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><del>-&quot;/*/WP_I18N_DB_CONNECT_DB*/);
</del><ins>+&quot;/*/WP_I18N_DB_CONN_ERROR*/, $details['db_host'] ), 'db_connect_fail' );
</ins><span class="cx">                 }
</span><span class="cx">                 $this-&gt;select( $details[ 'db_name' ], $this-&gt;$dbhname );
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>