MDL-17559 user edit: fixed undefined email property warnings; merged from MOODLE_19_S...

diff --git a/user/edit.php b/user/edit.php
index 7bf8b327ec319064825cd41eeae9e6296e3cbd75..4544635bb2f67866bd54fbb6cef90743fb3ae593 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -116,7 +116,7 @@
 
         if ($CFG->emailchangeconfirmation) {
             // Handle change of email carefully for non-trusted users
-            if ($user->email != $usernew->email && !has_capability('moodle/user:update', $systemcontext)) {
+            if (isset($usernew->email) and $user->email != $usernew->email && !has_capability('moodle/user:update', $systemcontext)) {
                 $a = new stdClass();
                 $a->newemail = $usernew->preference_newemail = $usernew->email;
                 $usernew->preference_newemailkey = random_string(20);

diff --git a/user/edit_form.php b/user/edit_form.php
index bc57cea03a3fca347daae25328c5612ca962e374..6341317dbf20bc1b17ca34014fd9e69d81500b2d 100644 (file)
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -113,17 +113,19 @@ class user_edit_form extends moodleform {
         $user    = $DB->get_record('user', array('id'=>$usernew->id));
 
         // validate email
-        if (!validate_email($usernew->email)) {
+        if (!isset($usernew->email)) {
+            // mail not confirmed yet
+        } else if (!validate_email($usernew->email)) {
             $errors['email'] = get_string('invalidemail');
         } else if (($usernew->email !== $user->email) and $DB->record_exists('user', array('email'=>$usernew->email, 'mnethostid'=>$CFG->mnet_localhost_id))) {
             $errors['email'] = get_string('emailexists');
         }
 
-        if ($usernew->email === $user->email and over_bounce_threshold($user)) {
+        if (isset($usernew->email) and $usernew->email === $user->email and over_bounce_threshold($user)) {
             $errors['email'] = get_string('toomanybounces');
         }
 
-        if (!empty($CFG->verifychangedemail) and !isset($errors['email']) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
+        if (isset($usernew->email) and !empty($CFG->verifychangedemail) and !isset($errors['email']) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
             $errorstr = email_is_not_allowed($usernew->email);
             if ($errorstr !== false) {
                 $errors['email'] = $errorstr;