Permalink
Browse files

Merge branch 'MDL-28386-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
  • Loading branch information...
2 parents 72307d9 + 6c9e270 commit e46da9a7fe4fc0f6ab452d1d8768e58addbfaa56 @nebgor nebgor committed Feb 28, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 user/editadvanced.php
@@ -139,7 +139,6 @@
$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 @@
$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 @@
$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)) {

0 comments on commit e46da9a

Please sign in to comment.