From 91c8fc90c07aab93eff13158dd21d3acb42eeb5f Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 29 Dec 2009 21:34:12 +0000 Subject: [PATCH] Don't set charset if mysql version does not have the collation cap. Props miqrogroove. see #11666 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@12573 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/wp-db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 8f136ad54..6ad88a49c 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -385,7 +385,7 @@ class wpdb { $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;