From: Brian Wolff <bawolff+wn@gmail.com>
Date: Tue, 29 Jul 2014 20:21:10 +0000 (-0300)
Subject: checkTemporaryPassword should call loadPasswords() first
X-Git-Tag: 1.31.0-rc.0~14679^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=514d1bc76d3dec28d0e392a847878a74404f9dee;p=lhc%2Fweb%2Fwiklou.git

checkTemporaryPassword should call loadPasswords() first

Otherwise mNewpassword could be null.

Mlpearc reports on irc getting fatals about mNewpassword not
being an object. I couldn't reproduce, but loadPasswords() should
definitely be called here.

Change-Id: I6d1b74b79c87d1a1870971aafd1349255170123d
---

diff --git a/includes/User.php b/includes/User.php
index 73d4959ee5..c42f3086b3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3821,6 +3821,7 @@ class User implements IDBAccessObject {
 		global $wgNewPasswordExpiry;
 
 		$this->load();
+		$this->loadPasswords();
 		if ( $this->mNewpassword->equals( $plaintext ) ) {
 			if ( is_null( $this->mNewpassTime ) ) {
 				return true;