--- C:/Documents and Settings/spatz/Desktop/vb_drupal_patches/New Folder/drupalvb.inc.php	Mon Apr 21 12:55:10 2008
+++ C:/Documents and Settings/spatz/Desktop/vb_drupal_patches/New Folder/Copy of drupalvb.inc.php	Wed Apr 23 08:59:32 2008
@@ -148,11 +148,11 @@
 }
 
 /**
  * Update an entry in the vB database user table.
  */
-function drupalvb_update_user($username, $password, $email, $salt) {
+function drupalvb_update_user($orig_username, $username, $password, $email, $salt) {
   // Set up the necessary variables.
   $lastdate = time();
   $setpass = '';
 
   if ($password != '') {
@@ -160,14 +160,14 @@
     if (strlen($password) != 32) {
       $password = md5($password);
     }
     $passhash = md5($password . $salt);
     $passdate = date('Y-m-d H:i:s', time());
-    drupalvb_db_query("UPDATE {user} SET password = '%s', passworddate = '%s', salt = '%s', email = '%s', lastactivity = '%s' WHERE username = '%s'", $passhash, $passdate, $salt, $email, $lastdate, $username);
+    drupalvb_db_query("UPDATE {user} SET username = '%s', password = '%s', passworddate = '%s', salt = '%s', email='%s', lastactivity = '%s' WHERE username = '%s'"), $username, $passhash, $passdate, $salt, $email, $lastdate, $orig_username);
   }
   else {
-    drupalvb_db_query("UPDATE {user} SET email = '%s', lastactivity = '%s' WHERE username = '%s'", $email, $lastdate, $username);
+    drupalvb_db_query("UPDATE {user} SET username = '%s', email = '%s', lastactivity = '%s' WHERE username = '%s'"), $username, $email, $lastdate, $orig_username);
   }
 }
 
 /**
  * Export all drupal users to vBulletin.