Changeset 11865 for trunk/wp-includes/wp-db.php

Timestamp:

08/21/2009 05:00:53 PM (15 years ago)

Author:

ryan

Message:

Machine parseable db error codes. Props dd32. fixes #10293

File:

• trunk/wp-includes/wp-db.php (modified) (6 diffs)

trunk/wp-includes/wp-db.php

@@ -297 +297 @@
 
     /**
+     * Database Username
+     *
+     * @since 2.9.0
+     * @access private
+     * @var string
+     */
+    var $dbuser;
+
+    /**
      * Connects to the database server and selects a database
      *
@@ -338 +347 @@
         if ( defined('DB_COLLATE') )
             $this->collate = DB_COLLATE;
+
+        $this->dbuser = $dbuser;
 
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
@@ -350 +361 @@
 </ul>
 <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>
-"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost));
+"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost), 'db_connect_fail');
             return;
         }
@@ -437 +448 @@
 <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>
 </ul>
-<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));
+<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');
             return;
         }
@@ -997 +1008 @@
      * @since 1.5.0
      *
-     * @param string $message
+     * @param string $message The Error message
+     * @param string $error_code (optional) A Computer readable string to identify the error.
      * @return false|void
      */
-    function bail($message) {
+    function bail($message, $error_code = '500') {
         if ( !$this->show_errors ) {
             if ( class_exists('WP_Error') )
-                $this->error = new WP_Error('500', $message);
+                $this->error = new WP_Error($error_code, $message);
             else
                 $this->error = $message;
@@ -1036 +1048 @@
      * @return bool True if collation is supported, false if version does not
      */
-    function supports_collation()
-    {
+    function supports_collation() {
         return $this->has_cap( 'collation' );
     }