moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-28386-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

Browse source
This commit is contained in:
Aparup Banerjee 2012-02-28 14:42:08 +08:00
commit 9a7310e80b
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
user/editadvanced.php
View file

@ -139,7 +139,6 @@ $userform = new user_editadvanced_form(null, array('editoroptions'=>$editoroptio
$userform->set_data($user);
if ($usernew = $userform->get_data()) {
add_to_log($course->id, 'user', 'update', "view.php?id=$user->id&course=$course->id", '');
if (empty($usernew->auth)) {
//user editing self
@ -161,6 +160,7 @@ if ($usernew = $userform->get_data()) {
$usernew->password = hash_internal_user_password($usernew->newpassword);
$usernew->id = $DB->insert_record('user', $usernew);
$usercreated = true;
add_to_log($course->id, 'user', 'add', "view.php?id=$usernew->id&course=$course->id", '');
} else {
$usernew = file_postupdate_standard_editor($usernew, 'description', $editoroptions, $usercontext, 'user', 'profile', 0);
@ -171,6 +171,7 @@ if ($usernew = $userform->get_data()) {
$DB->update_record('user', $user);
print_error('cannotupdateuseronexauth', '', '', $user->auth);
}
add_to_log($course->id, 'user', 'update', "view.php?id=$user->id&course=$course->id", '');
//set new password if specified
if (!empty($usernew->newpassword)) {