From b63ab17d5218c95ed2a677b1b6a8be9a833c275a Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Mon, 19 Oct 2015 16:50:01 -0500 Subject: [PATCH] MDL-51837 user: Check if user email is set on validation Add a check if the user's email is set before performing validation on the user's email address. This is to prevent the warning messages to be shown in the case of a pending email change which causes the user's email field to be not included in the Edit profile form. --- user/editadvanced_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php index ea95370ae08..c9a564a39ba 100644 --- a/user/editadvanced_form.php +++ b/user/editadvanced_form.php @@ -259,7 +259,7 @@ class user_editadvanced_form extends moodleform { } } - if (!$user or $user->email !== $usernew->email) { + if (!$user or (isset($usernew->email) && $user->email !== $usernew->email)) { if (!validate_email($usernew->email)) { $err['email'] = get_string('invalidemail'); } else if ($DB->record_exists('user', array('email' => $usernew->email, 'mnethostid' => $CFG->mnet_localhost_id))) {