Backing out last patch - needs fixing differently

login/change_password.php

@@ -140,10 +140,6 @@
  *****************************************************************************/
 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 {
@@ -152,7 +148,7 @@ function validate_form($frm, &$err) {
         } else {  
             if (!isadmin()) {
                 //require non adminusers to give valid password
-                if(!$validatepw) {
+                if(!authenticate_user_login($frm->username, $frm->password)) {
                     $err->password = get_string('wrongpassword');
                 }
             }