Changeset 13327

Timestamp:

02/23/2010 09:44:27 AM (15 years ago)

Author:

nacin

Message:

Use sprintf() in hard-coded string. Use same comment and error code as other identical message. See #11644 props hakre

File:

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

trunk/wp-includes/wp-db.php

@@ -990 +990 @@
         $this->$dbhname = @mysql_connect( $details[ 'db_host' ], $details[ 'db_user' ], $details[ 'db_password' ] );
         if (!$this->$dbhname ) {
-            $this->bail(/*WP_I18N_DB_CONNECT_DB*/"
+            $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>{$details['db_host']}</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>. This could mean your host's database server is down.</p>
 <ul>
     <li>Are you sure you have the correct username and password?</li>
@@ -999 +999 @@
 </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_CONNECT_DB*/);
+"/*/WP_I18N_DB_CONN_ERROR*/, $details['db_host'] ), 'db_connect_fail' );
         }
         $this->select( $details[ 'db_name' ], $this->$dbhname );