Changeset 15808

Timestamp:

10/14/2010 06:47:39 PM (16 years ago)

Author:

westi

Message:

Display mysql_connect errors when WP_DEBUG is enabled. Fixes #14654 props lloydbudd and hakre
Always die if we can't connect to the db no point in going any futher.

File:

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

trunk/wp-includes/wp-db.php

@@ -1027 +1027 @@
                 global $db_list, $global_db_list;
 
-                $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+                if ( WP_DEBUG ) {
+                        $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+                } else {
+                        $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+                }
 
                 if ( !$this->dbh ) {
@@ -1040 +1044 @@
 <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*/, $this->dbhost ), 'db_connect_fail' );
+                        
+                        //If show errors is disabled then we need to die anyway as we don't have a working DB connection
+                        die();
                 }