? .cache
? .project
? .projectOptions
? files
? test.patch
? includes/image.imagemagick.inc
? misc/Thumbs.db
? misc/farbtastic/Thumbs.db
? sites/all/modules
? sites/default/settings.php
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.841
diff -u -p -u -p -r1.841 user.module
--- modules/user/user.module	6 Sep 2007 12:47:20 -0000	1.841
+++ modules/user/user.module	7 Sep 2007 23:50:35 -0000
@@ -377,6 +377,10 @@ function user_validate_picture(&$form, &
     $destination = variable_get('user_picture_path', 'pictures') .'/picture-'. $form['#uid'] .'.'. $info['extension'];
     if (file_copy($file, $destination, FILE_EXISTS_REPLACE)) {
       $form_state['values']['picture'] = $file->filepath;
+      // Remove the old picture.
+      if (isset($form_state['values']['_account']->picture) && file_exists($form_state['values']['_account']->picture)) {
+        file_delete($form_state['values']['_account']->picture);
+      }
     }
     else {
       form_set_error('picture_upload', t("Failed to upload the picture image; the %directory directory doesn't exist or is not writable.", array('%directory' => variable_get('user_picture_path', 'pictures'))));