From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 26 Nov 2008 03:41:28 +0000 (+0000)
Subject: Opp, add this bit back
X-Git-Tag: 1.31.0-rc.0~44195
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=182117acd83dd67ea1b2c4591444ee927a1c2367;p=lhc%2Fweb%2Fwiklou.git

Opp, add this bit back
---

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 05889c80ab..05769681fc 100644
--- 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' ) );
 		}