Skip to content
Permalink
Browse files

The user editing screen and the change password screen didn't play very

well with debug = on. In fact the change password screen didn't play at all.

Made a few small changes to fix notices and now everything works OK.
Added a missing language string.

*****************
This problem may very well exist in MOODLE_14_STABLE too! Unfortunately I
don't have access to a 1.4 checkout right now, so it will have to wait.
*****************
  • Loading branch information...
defacer
defacer committed Dec 16, 2004
1 parent d6b3c7b commit 54598fb04ee729dd37529d8a4ce3fd8a0cdde3a2
Showing with 5 additions and 7 deletions.
  1. +1 −0 lang/en/moodle.php
  2. +3 −6 login/change_password.php
  3. +1 −1 user/edit.html
@@ -715,6 +715,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';
@@ -67,7 +67,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,
@@ -86,11 +86,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();
@@ -60,7 +60,7 @@
}
echo " </td>";
echo "</tr>\n";
if (!$adminself && ($CFG->{'auth_'.$user->auth.'_stdchangepassword'} || $CFG->changepassword)){
if (!$adminself && (!empty($CFG->{'auth_'.$user->auth.'_stdchangepassword'}) || $CFG->changepassword)){
if (get_user_preferences('auth_forcepasswordchange', NULL, $user->id)) {
$checked = ' checked="checked" ';
} else {

0 comments on commit 54598fb

Please sign in to comment.
You can’t perform that action at this time.