From d498c973c46532800c103508e55e482fc8298446 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Wed, 13 Nov 2013 16:04:34 -0800
Subject: [PATCH] MDL-42884 core_user: fixed issue when deleting users with
 invalid emails throws invalidusername exception

---
 lib/moodlelib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c21b5fed5b9..7ca3cc11ae6 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4195,7 +4195,7 @@ function delete_user(stdClass $user) {
     \core\session\manager::kill_user_sessions($user->id);
 
     // Workaround for bulk deletes of users with the same email address.
-    $delname = "$user->email.".time();
+    $delname = clean_param($user->email . "." . time(), PARAM_USERNAME);
     while ($DB->record_exists('user', array('username' => $delname))) { // No need to use mnethostid here.
         $delname++;
     }
-- 
2.11.4.GIT