Ticket #10293: 10293.diff

wp-includes/wp-db.php

@@ -296 +296 @@
         var $real_escape = false;
 
         /**
+         * Database Username
+         *
+         * @since 2.9.0
+         * @access private
+         * @var string
+         */
+        var $dbuser;
+
+        /**
          * Connects to the database server and selects a database
          *
          * PHP4 compatibility layer for calling the PHP5 constructor.
@@ -338 +347 @@
                 if ( defined('DB_COLLATE') )
                         $this->collate = DB_COLLATE;
 
+                $this->dbuser = $dbuser;
+
                 $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
                 if (!$this->dbh) {
                         $this->bail(sprintf(/*WP_I18N_DB_CONN_ERROR*/"
@@ -349 +360 @@
         <li>Are you sure that the database server is running?</li>
 </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;
                 }
 
@@ -436 +447 @@
 <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
 <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;
                 }
         }
@@ -996 +1007 @@
          *
          * @since 1.5.0
          *
-         * @param string $message
+         * @param string $message The Error message
+         * @param string $code (optional) A Computer readable string to identify the error.
          * @return false|void
          */
-        function bail($message) {
+        function bail($message, $code = '') {
                 if ( !$this->show_errors ) {
                         if ( class_exists('WP_Error') )
-                                $this->error = new WP_Error('500', $message);
+                                $this->error = new WP_Error('500', $message, $code);
                         else
                                 $this->error = $message;
                         return false;
@@ -1035 +1047 @@
          *
          * @return bool True if collation is supported, false if version does not
          */
-        function supports_collation()
-        {
+        function supports_collation() {
                 return $this->has_cap( 'collation' );
         }