Merge branch 'wip-mdl-46372-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

This commit is contained in:
Sam Hemelryk
2014-07-21 10:42:35 +12:00
+8
View File
@@ -184,6 +184,7 @@ if ($usernew = $userform->get_data()) {
$usernew->password = hash_internal_user_password($usernew->newpassword);
}
$usernew->id = user_create_user($usernew, false, false);
$usercreated = true;
} else {
$usernew = file_postupdate_standard_editor($usernew, 'description', $editoroptions, $usercontext, 'user', 'profile', 0);
// Pass a true old $user here.
@@ -242,6 +243,13 @@ if ($usernew = $userform->get_data()) {
set_user_preference('auth_forcepasswordchange', 1, $usernew);
}
// Trigger update/create event, after all fields are stored.
if ($usercreated) {
\core\event\user_created::create_from_userid($usernew->id)->trigger();
} else {
\core\event\user_updated::create_from_userid($usernew->id)->trigger();
}
if ($user->id == $USER->id) {
// Override old $USER session variable
foreach ((array)$usernew as $variable => $value) {