Permalink
Browse files

MDL-17559 user edit: fixed undefined email property warnings

  • Loading branch information...
1 parent b926e3d commit 2fa8ad59f9bb03dda07f4068b0d5677a94d85d9b skodak committed Dec 8, 2008
Showing with 6 additions and 4 deletions.
  1. +1 −1 user/edit.php
  2. +5 −3 user/edit_form.php
View
@@ -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);
View
@@ -113,17 +113,19 @@ function validation($usernew, $files) {
$user = get_record('user', '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 record_exists('user', '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;

0 comments on commit 2fa8ad5

Please sign in to comment.