Skip to content
Browse files

Don't set charset if mysql version does not have the collation cap. P…

…rops miqrogroove. see #11666 for 2.9k

git-svn-id: http://svn.automattic.com/wordpress/branches/2.9@12574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent d172617 commit 9b7adfd31211df4129bb79931ff4289431946a18 ryan committed Dec 29, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 wp-includes/wp-db.php
View
2 wp-includes/wp-db.php
@@ -385,7 +385,7 @@ function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
$this->ready = true;
- if ( !empty($this->charset) ) {
+ if ( $this->has_cap( 'collation' ) && !empty($this->charset) ) {
if ( function_exists('mysql_set_charset') ) {
mysql_set_charset($this->charset, $this->dbh);
$this->real_escape = true;

0 comments on commit 9b7adfd

Please sign in to comment.
Something went wrong with that request. Please try again.