Skip to content
Browse files

Merged Jon's fixes from HEAD for change password in debug mode. Chang…

…es in user/edit.html not present in stable so not patched
  • Loading branch information...
1 parent b8be930 commit 13f26d69a78fa41b98b3e57862254db27f32f240 mjollnir_ committed Dec 16, 2004
Showing with 4 additions and 6 deletions.
  1. +1 −0 lang/en/moodle.php
  2. +3 −6 login/change_password.php
View
1 lang/en/moodle.php
@@ -714,6 +714,7 @@
$string['moveselectedcoursesto'] = 'Move selected courses to...';
$string['movetoanotherfolder'] = 'Move to another folder';
$string['moveup'] = 'Move up';
+$string['mustchangepassword'] = 'The new password must be different than the current one';
$string['mustconfirm'] = 'You need to confirm your login';
$string['mycourses'] = 'My courses';
$string['name'] = 'Name';
View
9 login/change_password.php
@@ -44,7 +44,7 @@
$strpasswordchanged = get_string("passwordchanged");
- if ($course->id) {
+ if (!empty($course->id)) {
add_to_log($course->id, "user", "change password", "view.php?id=$user->id&course=$course->id", "$user->id");
$fullname = fullname($USER, true);
print_header($strpasswordchanged, $strpasswordchanged,
@@ -64,11 +64,8 @@
}
}
-
-
- if ($course->id) {
- $frm->id = $id;
- }
+ // We NEED to set this, because the form assumes it has a value!
+ $frm->id = empty($course->id) ? 0 : $course->id;
if (empty($frm->username)) {
$frm->username = get_moodle_cookie();

0 comments on commit 13f26d6

Please sign in to comment.
Something went wrong with that request. Please try again.