Changes from trunk/wp-includes/wp-db.php at r12410 to branches/2.9/wp-includes/wp-db.php at r12574

File:

• branches/2.9/wp-includes/wp-db.php (modified) (1 diff)

branches/2.9/wp-includes/wp-db.php

@@ -386 +386 @@
         $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);