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 73d4959..c42f308 100644 (file)
--- 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;