Merge "checkTemporaryPassword should call loadPasswords() first"

diff --combined includes/User.php
index bc06f97,c42f308..588826c
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -38,6 -38,14 +38,6 @@@ define( 'MW_USER_VERSION', 10 )
   */
  define( 'EDIT_TOKEN_SUFFIX', '+\\' );
  
 -/**
 - * Thrown by User::setPassword() on error.
 - * @ingroup Exception
 - */
 -class PasswordError extends MWException {
 -      // NOP
 -}
 -
  /**
   * The User object encapsulates all of the user-specific settings (user_id,
   * name, rights, password, email address, options, last login time). Client
@@@ -2412,8 -2420,8 +2412,8 @@@ class User implements IDBAccessObject 
                if ( $str == $this->mEmail ) {
                        return;
                }
 -              $this->mEmail = $str;
                $this->invalidateEmail();
 +              $this->mEmail = $str;
                wfRunHooks( 'UserSetEmail', array( $this, &$this->mEmail ) );
        }
  
@@@ -3813,6 -3821,7 +3813,7 @@@
                global $wgNewPasswordExpiry;
  
                $this->load();
+               $this->loadPasswords();
                if ( $this->mNewpassword->equals( $plaintext ) ) {
                        if ( is_null( $this->mNewpassTime ) ) {
                                return true;
@@@ -4063,7 -4072,6 +4064,7 @@@
                $this->mEmailToken = null;
                $this->mEmailTokenExpires = null;
                $this->setEmailAuthenticationTimestamp( null );
 +              $this->mEmail = '';
                wfRunHooks( 'InvalidateEmailComplete', array( $this ) );
                return true;
        }
@@@ -4607,10 -4615,10 +4608,10 @@@
         * @param bool|string $salt Optional salt, may be random or the user ID.
         *  If unspecified or false, will generate one automatically
         * @return string Password hash
 -       * @deprecated since 1.23, use Password class
 +       * @deprecated since 1.24, use Password class
         */
        public static function crypt( $password, $salt = false ) {
 -              wfDeprecated( __METHOD__, '1.23' );
 +              wfDeprecated( __METHOD__, '1.24' );
                $hash = self::getPasswordFactory()->newFromPlaintext( $password );
                return $hash->toString();
        }
@@@ -4624,10 -4632,10 +4625,10 @@@
         * @param string|bool $userId User ID for old-style password salt
         *
         * @return bool
 -       * @deprecated since 1.23, use Password class
 +       * @deprecated since 1.24, use Password class
         */
        public static function comparePasswords( $hash, $password, $userId = false ) {
 -              wfDeprecated( __METHOD__, '1.23' );
 +              wfDeprecated( __METHOD__, '1.24' );
  
                // Check for *really* old password hashes that don't even have a type
                // The old hash format was just an md5 hex hash, with no type information