WP Merge to rev 4956

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

1 files changed, 3 insertions, 3 deletions

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 233b569..98ae962 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -50,7 +50,7 @@ class wpdb {
 			$this->db_connect();
 		return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
 	}
-	
+
 	function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
 		register_shutdown_function(array(&$this, "__destruct"));
 
@@ -81,7 +81,7 @@ class wpdb {
 	}
 
 	function __destruct() {
-		return true;		
+		return true;	
 	}
 
 	/**
@@ -320,7 +320,7 @@ class wpdb {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 		if ( $query )
 			$this->query($query);
-		
+	
 		if ( !isset($this->last_result[$y]) )
 			return null;