<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11865] trunk/wp-includes/wp-db.php: Machine parseable db error codes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11865">11865</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-08-21 17:00:53 +0000 (Fri, 21 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Machine parseable db error codes. Props dd32. fixes <a href="http://trac.wordpress.org/ticket/10293">#10293</a></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 (11864 => 11865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2009-08-21 16:45:41 UTC (rev 11864)
+++ trunk/wp-includes/wp-db.php 2009-08-21 17:00:53 UTC (rev 11865)
</span><span class="lines">@@ -296,6 +296,15 @@
</span><span class="cx"> var $real_escape = false;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Database Username
+ *
+ * @since 2.9.0
+ * @access private
+ * @var string
+ */
+ var $dbuser;
+
+ /**
</ins><span class="cx"> * Connects to the database server and selects a database
</span><span class="cx"> *
</span><span class="cx"> * PHP4 compatibility layer for calling the PHP5 constructor.
</span><span class="lines">@@ -338,6 +347,8 @@
</span><span class="cx"> if ( defined('DB_COLLATE') )
</span><span class="cx"> $this->collate = DB_COLLATE;
</span><span class="cx">
</span><ins>+ $this->dbuser = $dbuser;
+
</ins><span class="cx"> $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
</span><span class="cx"> if (!$this->dbh) {
</span><span class="cx"> $this->bail(sprintf(/*WP_I18N_DB_CONN_ERROR*/"
</span><span class="lines">@@ -349,7 +360,7 @@
</span><span class="cx"> <li>Are you sure that the database server is running?</li>
</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><del>-"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost));
</del><ins>+"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost), 'db_connect_fail');
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -436,7 +447,7 @@
</span><span class="cx"> <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
</span><span class="cx"> <li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
</span><span class="cx"> </ul>
</span><del>-<p>If you don\'t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, DB_USER));
</del><ins>+<p>If you don\'t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser), 'db_select_fail');
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -996,13 +1007,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param string $message
</del><ins>+ * @param string $message The Error message
+ * @param string $error_code (optional) A Computer readable string to identify the error.
</ins><span class="cx"> * @return false|void
</span><span class="cx"> */
</span><del>- function bail($message) {
</del><ins>+ function bail($message, $error_code = '500') {
</ins><span class="cx"> if ( !$this->show_errors ) {
</span><span class="cx"> if ( class_exists('WP_Error') )
</span><del>- $this->error = new WP_Error('500', $message);
</del><ins>+ $this->error = new WP_Error($error_code, $message);
</ins><span class="cx"> else
</span><span class="cx"> $this->error = $message;
</span><span class="cx"> return false;
</span><span class="lines">@@ -1035,8 +1047,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return bool True if collation is supported, false if version does not
</span><span class="cx"> */
</span><del>- function supports_collation()
- {
</del><ins>+ function supports_collation() {
</ins><span class="cx"> return $this->has_cap( 'collation' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>