? .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:56:15 -0000
@@ -370,6 +370,11 @@ function user_validate_picture(&$form, &
     'file_validate_size' => array(variable_get('user_picture_file_size', '30') * 1024),
   );
   if ($file = file_save_upload('picture_upload', $validators)) {
+    // 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);
+    }
+
     // The image was saved using file_save_upload() and was added to the
     // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.