From 9d7d1050a3fae1b36dddb703a259e12d14fb4912 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 24 May 2005 04:28:00 +0000 Subject: [PATCH] removed crippled enotif code from checkPassword(), this is roughly how it was in 1.106 --- includes/User.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/includes/User.php b/includes/User.php index 28ed805e66..ef785c31c2 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1306,17 +1306,6 @@ class User { if ( 0 == strcmp( $ep, $this->mPassword ) ) { return true; } elseif ( ($this->mNewpassword != '') && (0 == strcmp( $ep, $this->mNewpassword )) ) { - # If e-mail confirmation hasn't been done already, - # we may as well confirm it here -- the user can only - # get this password via e-mail. - $this->mEmailAuthenticated = wfTimestampNow(); - - # use the temporary one-time password only once: clear it now ! - - # Emergency measure. Uncomment blanking of one-time password - # reported in bug 2126 - # $this->mNewpassword = ''; - $this->saveSettings(); return true; } elseif ( function_exists( 'iconv' ) ) { # Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted -- 2.20.1