Ticket #13657: 13657.diff

wp-includes/wp-db.php

@@ -521 +521 @@
                 if ( !$this->dbh ) {
                         $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
 <h1>Error establishing a database connection</h1>
-<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
+<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. The specific error message was: </p>
 <ul>
-        <li>Are you sure you have the correct username and password?</li>
-        <li>Are you sure that you have typed the correct hostname?</li>
-        <li>Are you sure that the database server is running?</li>
+        <li>%s</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 ), 'db_connect_fail' );
+"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost, mysql_error() ), 'db_connect_fail' );
                         return;
                 }
 
@@ -1038 +1036 @@
                 if (!$this->$dbhname ) {
                         $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
 <h1>Error establishing a database connection</h1>
-<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
+<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. The specific error message was: </p>
 <ul>
-        <li>Are you sure you have the correct username and password?</li>
-        <li>Are you sure that you have typed the correct hostname?</li>
-        <li>Are you sure that the database server is running?</li>
+        <li>%s</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*/, $details['db_host'] ), 'db_connect_fail' );
+"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost, mysql_error() ), 'db_connect_fail' );
                 }
                 $this->select( $details[ 'db_name' ], $this->$dbhname );
         }