Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.944
diff -u -p -r1.944 user.module
--- modules/user/user.module	29 Nov 2008 09:33:51 -0000	1.944
+++ modules/user/user.module	4 Dec 2008 02:25:41 -0000
@@ -672,7 +672,7 @@ function user_user_view(&$edit, &$accoun
 function user_user_form(&$edit, &$account, $category = NULL) {
   if ($category == 'account') {
     $form_state = array();
-    return user_edit_form($form_state, arg(1), $edit);
+    return user_edit_form($form_state, (isset($account->uid) ? $account->uid : FALSE), $edit);
   }
 }
 
@@ -681,7 +681,7 @@ function user_user_form(&$edit, &$accoun
  */
 function user_user_validate(&$edit, &$account, $category = NULL) {
   if ($category == 'account') {
-    return _user_edit_validate(arg(1), $edit);
+    return _user_edit_validate($account, $edit);
   }
 }
 
@@ -690,7 +690,7 @@ function user_user_validate(&$edit, &$ac
  */
 function user_user_submit(&$edit, &$account, $category = NULL) {
   if ($category == 'account') {
-    return _user_edit_submit(arg(1), $edit);
+    return _user_edit_submit($account, $edit);
   }
 }
 
@@ -1534,10 +1534,10 @@ function user_edit_form(&$form_state, $u
   return $form;
 }
 
-function _user_edit_validate($uid, &$edit) {
-  $user = user_load(array('uid' => $uid));
+function _user_edit_validate($account, &$edit) {
+  $uid = isset($account->uid) ? $account->uid : FALSE;
   // Validate the username:
-  if (user_access('change own username') || user_access('administer users') || !$user->uid) {
+  if (user_access('change own username') || user_access('administer users') || !$uid) {
     if ($error = user_validate_name($edit['name'])) {
       form_set_error('name', $error);
     }
@@ -1555,12 +1555,11 @@ function _user_edit_validate($uid, &$edi
   }
 }
 
-function _user_edit_submit($uid, &$edit) {
-  $user = user_load(array('uid' => $uid));
+function _user_edit_submit($account, &$edit) {
   // Delete picture if requested, and if no replacement picture was given.
   if (!empty($edit['picture_delete'])) {
-    if ($user->picture && file_exists($user->picture)) {
-      file_unmanaged_delete($user->picture);
+    if ($account->picture && file_exists($account->picture)) {
+      file_unmanaged_delete($account->picture);
     }
     $edit['picture'] = '';
   }