MDL-13811: Merged fix to work when email is disabled

diff --git a/user/edit.php b/user/edit.php
index 4af410237832aad5482938673b477c1222aef07c..064fb308fdf072bf10eae789dbf1e656c1614919 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -166,6 +166,7 @@
         if ($email_changed && $CFG->emailchangeconfirmation) {
             $temp_user = fullclone($user);
             $temp_user->email = $usernew->preference_newemail;
+            $temp_user->emailstop = NULL;
 
             $a = new stdClass();
             $a->url = $CFG->wwwroot . '/user/emailupdate.php?key=' . $usernew->preference_newemailkey . '&id=' . $user->id;
@@ -175,7 +176,7 @@
             $emailupdatemessage = get_string('auth_emailupdatemessage', 'auth', $a);
             $emailupdatetitle = get_string('auth_emailupdatetitle', 'auth', $a);
 
-            if(!$mail_results = email_to_user($temp_user, get_admin(), $emailupdatetitle, $emailupdatemessage)) {
+            if (!$mail_results = email_to_user($temp_user, get_admin(), $emailupdatetitle, $emailupdatemessage)) {
                 die("could not send email!");
             }
         }

diff --git a/user/emailupdate.php b/user/emailupdate.php
index 6a6801349c6c23f606d9e7db21aa60c739b7d946..6273ab38d6804aa1ea0f96be34ef38a2633561fb 100755 (executable)
--- a/user/emailupdate.php
+++ b/user/emailupdate.php
@@ -1,4 +1,5 @@
 <?php // $Id$
+
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/user/editlib.php');