Changeset 7579

Timestamp:

03/30/2008 05:56:27 PM (18 years ago)

Author:

westi

Message:

Specify collation as well when connecting to the database if it is provided. See #6410 for trunk.

File:

• trunk/wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-includes/wp-db.php

@@ -85 +85 @@
                 $this->ready = true;
 
-                if ( !empty($this->charset) && version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') )
-                        $this->query("SET NAMES '$this->charset'");
-
+                if ( $this->supports_collation() ) {
+                        $collation_query = '';
+                        if ( !empty($this->charset) ) {
+                                $collation_query = "SET NAMES '{$this->charset}'";
+                                if (!empty($this->collate) )
+                                        $collation_query .= " COLLATE '{$this->collate}'";
+                        }
+                        
+                        if ( !empty($collation_query) )
+                                $this->query($collation_query);
+                        
+                }
+                
                 $this->select($dbname);
         }