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

Timestamp:

02/19/2010 01:03:58 AM (17 years ago)

Author:

nacin

Message:

Assume WP_DEBUG is defined in wpdb. Remove unnecessary constant() calls. Ensure DB_COLLATE defined as empty string doesn't override default Multisite collation. fixes #12041, see #11644

File:

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

trunk/wp-includes/wp-db.php

@@ -346 +346 @@
          */
         function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
-                if( defined( "WP_USE_MULTIPLE_DB" ) && CONSTANT( "WP_USE_MULTIPLE_DB" ) == true )
+                if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB )
                         $this->db_connect();
                 return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
@@ -368 +368 @@
                 register_shutdown_function(array(&$this, "__destruct"));
 
-                if ( defined( 'WP_DEBUG' ) && WP_DEBUG )
+                if ( WP_DEBUG )
                         $this->show_errors();
 
                 if ( is_multisite() ) {
                         $this->charset = 'utf8';
-                        if ( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' )
-                                $this->collate = constant( 'DB_COLLATE' );
+                        if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
+                                $this->collate = DB_COLLATE;
                         else
                                 $this->collate = 'utf8_general_ci';
+                } elseif ( defined( 'DB_COLLATE' ) ) {
+                        $this->collate = DB_COLLATE;
                 }
 
                 if ( defined('DB_CHARSET') )
                         $this->charset = DB_CHARSET;
-
-                if ( defined('DB_COLLATE') )
-                        $this->collate = DB_COLLATE;
 
                 $this->dbuser = $dbuser;
@@ -667 +666 @@
                         $msg = "WordPress database error: [$str]\n{$this->last_query}\n";
                         if ( defined( 'ERRORLOGFILE' ) )
-                                error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
+                                error_log( $msg, 3, ERRORLOGFILE );
                         if ( defined( 'DIEONDBERROR' ) )
                                 die( $msg );
@@ -808 +807 @@
                 // use $this->dbhglobal for gloal table ops
                 unset( $dbh );
-                if( defined( "WP_USE_MULTIPLE_DB" ) && CONSTANT( "WP_USE_MULTIPLE_DB" ) == true ) {
+                if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB ) {
                         if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
                                 if( false == isset( $this->dbhglobal ) ) {