Merge branch 'MDL-51837-29' of git://github.com/junpataleta/moodle into MOODLE_29_STABLE

2015-11-09 11:33:02 +00:00
parent 1542f9d5b0 b63ab17d52
commit eb7fb32928
1 changed files with 1 additions and 1 deletions
@@ -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))) {