MDL-20941 store hashed username into user->email field for deleted users. Merged...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index ee364c983a995a6f2a64b4fc79bc60844aabdbad..2e2ada81e644b78c91c6aa494dd1050785795615 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3441,9 +3441,9 @@ function delete_user($user) {
     $updateuser = new object();
     $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->username     = $delname;            // Remember it just in case
+    $updateuser->email        = md5($user->username);// Store hash of username, useful importing/restoring users
+    $updateuser->idnumber     = '';                  // Clear this field to free it up
     $updateuser->timemodified = time();
 
     $DB->update_record('user', $updateuser);