WP Merge

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

1 files changed, 2 insertions, 1 deletions

diff --git a/wp-inst/wp-includes/wp-db.php b/wp-inst/wp-includes/wp-db.php
index 9faa97e..142a3ec 100644
--- a/wp-inst/wp-includes/wp-db.php
+++ b/wp-inst/wp-includes/wp-db.php
@@ -28,6 +28,7 @@ class wpdb {
 	var $post2cat;
 	var $comments;
 	var $links;
+	var $link2cat;
 	var $linkcategories;
 	var $options;
 	var $optiontypes;
@@ -42,7 +43,7 @@ class wpdb {
 	function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
 
 		if( defined( "WP_USE_MULTIPLE_DB" ) && CONSTANT( "WP_USE_MULTIPLE_DB" ) == true ) {
-			$this->db_connect( $query );
+			$this->db_connect();
 			return true;
 		}