Wordpress 2.9.2-scripts

[autoinstalls/wordpress.git] / wp-includes / wp-db.php

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index d2f79a63995400dfa5f06d6bada4cc1c8f4b5d84..bc634382b27704bc4fa82123bf8080f957d43188 100644 (file)
--- 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;