diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-11 15:52:14 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-11 15:52:14 +0000 |
| commit | 7fc7923d46eb2ef698128a6ee62cad76a44c4277 (patch) | |
| tree | 418907df76307d3b2dd1c6d4a2b02a308ed5b186 /wp-includes/wp-db.php | |
| parent | 70e5c187ce118d85b8afa73e07e49892f3df0dda (diff) | |
| download | wordpress-mu-7fc7923d46eb2ef698128a6ee62cad76a44c4277.tar.gz wordpress-mu-7fc7923d46eb2ef698128a6ee62cad76a44c4277.tar.xz wordpress-mu-7fc7923d46eb2ef698128a6ee62cad76a44c4277.zip | |
Use DB_COLLATE constant to define collate variable.
Change utf8 to something mysql understands, fixes #539
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1182 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wp-db.php')
| -rw-r--r-- | wp-includes/wp-db.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index fae9bbc..8c72acd 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -63,7 +63,11 @@ class wpdb { $this->show_errors(); $this->charset = 'utf8'; - $this->collate = 'utf8'; + if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) { + $this->collate = constant( 'DB_COLLATE' ); + } else { + $this->collate = 'utf8_general_ci'; + } if ( defined('DB_CHARSET') ) $this->charset = DB_CHARSET; |