WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@7579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-03-30 17:56:27 +00:00
parent 6e9a44bd99
commit 74a7fc7923
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/wp-db.php
View File

@ -84,8 +84,18 @@ class wpdb {
$this->ready = true; $this->ready = true;
if ( !empty($this->charset) && version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') ) if ( $this->supports_collation() ) {
$this->query("SET NAMES '$this->charset'"); $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); $this->select($dbname);
} }