Opp, add this bit back

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 05889c8..0576968 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -167,7 +167,7 @@ class PasswordReset extends SpecialPage {
                        throw new PasswordError( wfMsg( 'badretype' ) );
                }
 
-               if( !$user->checkPassword( $this->mOldpass ) ) {
+               if( !$user->checkTemporaryPassword($this->mOldpass) && !$user->checkPassword($this->mOldpass) ) {
                        wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'wrongpassword' ) );
                        throw new PasswordError( wfMsg( 'resetpass-wrong-oldpass' ) );
                }