Merged from MOODLE_15_STABLE: Fixing problem where admins couldn't change their password (with external auth)

This commit is contained in:
mjollnir_
2005-12-04 22:30:35 +00:00
parent e159d1be10
commit f3929d413c
+5 -1
View File
@@ -140,6 +140,10 @@
*****************************************************************************/
function validate_form($frm, &$err) {
// we always need to call this because it handles the
// loading of the auth libraries, and we need that for later.
$validatepw = authenticate_user_login($frm->username, $frm->password);
if (empty($frm->username)){
$err->username = get_string('missingusername');
} else {
@@ -148,7 +152,7 @@ function validate_form($frm, &$err) {
} else {
if (!isadmin()) {
//require non adminusers to give valid password
if(!authenticate_user_login($frm->username, $frm->password)) {
if(!$validatepw) {
$err->password = get_string('wrongpassword');
}
}