WP Merge to rev 4865

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@879 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 12 insertions, 2 deletions

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 1ed50b4..233b569 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -28,8 +28,6 @@ class wpdb {
 	var $post2cat;
 	var $comments;
 	var $links;
-	var $link2cat;
-	var $linkcategories;
 	var $options;
 	var $optiontypes;
 	var $optionvalues;
@@ -37,6 +35,9 @@ class wpdb {
 	var $optiongroup_options;
 	var $postmeta;
 
+	var $charset;
+	var $collate;
+
 	/**
 	 * Connects to the database server and selects a database
 	 * @param string $dbuser
@@ -53,6 +54,12 @@ class wpdb {
 	function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
 		register_shutdown_function(array(&$this, "__destruct"));
 
+		if ( defined('DB_CHARSET') )
+			$this->charset = DB_CHARSET;
+
+		if ( defined('DB_COLLATE') )
+			$this->collate = DB_COLLATE;
+
 		$this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
 		if (!$this->dbh) {
 			$this->bail("
@@ -67,6 +74,9 @@ class wpdb {
 ");
 		}
 
+		if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+ 			$this->query("SET NAMES '$this->charset'");
+
 		$this->select($dbname, $this->dbh);
 	}