### Eclipse Workspace Patch 1.0
#P 19stable
Index: lib/moodlelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
retrieving revision 1.960.2.99
diff -u -r1.960.2.99 moodlelib.php
--- lib/moodlelib.php	26 Sep 2008 08:08:21 -0000	1.960.2.99
+++ lib/moodlelib.php	9 Oct 2008 02:59:12 -0000
@@ -3006,7 +3019,10 @@
     tag_set('user', $user->id, array());
 
     // workaround for bulk deletes of users with the same email address
-    $delname = addslashes("$user->email.".time());
+    $deltime = time();
+    $delname = addslashes("$user->username.$deltime");
+    $delidnumber = addslashes("$user->idnumber.$deltime");
+    $delemail = addslashes("$user->email.$deltime");
     while (record_exists('user', 'username', $delname)) { // no need to use mnethostid here
         $delname++;
     }
@@ -3016,8 +3032,8 @@
     $updateuser->id           = $user->id;
     $updateuser->deleted      = 1;
     $updateuser->username     = $delname;         // Remember it just in case
-    $updateuser->email        = '';               // Clear this field to free it up
-    $updateuser->idnumber     = '';               // Clear this field to free it up
+    $updateuser->email        = $delemail;               // Clear this field to free it up
+    $updateuser->idnumber     = $delidnumber;               // Clear this field to free it up
     $updateuser->timemodified = time();
 
     if (update_record('user', $updateuser)) {