X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..refs/tags/wordpress-2.9.2-scripts:/wp-includes/wp-db.php

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index d2f79a63..bc634382 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;