From 7f596d7097e0eaa76886b2e59903fd9dac8f3fed Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Sun, 10 Jan 2010 10:40:12 +0000 Subject: [PATCH] * Send new password e-mail in users preference language --- RELEASE-NOTES | 1 + includes/specials/SpecialUserlogin.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 11434aa08e..c06667d58f 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -295,6 +295,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN equivalents. * (bug 22051) Returing false in SpecialContributionsBeforeMainOutput hook now stops normal output +* Send new password e-mail in users preference language === Bug fixes in 1.16 === diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index a13a3a61d6..5e8e3d8524 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -727,10 +727,10 @@ class LoginForm { $np = $u->randomPassword(); $u->setNewpassword( $np, $throttle ); $u->saveSettings(); - - $m = wfMsgExt( $emailText, array( 'parsemag' ), $ip, $u->getName(), $np, + $userLanguage = $u->getOption( 'language' ); + $m = wfMsgExt( $emailText, array( 'parsemag', 'language' => $userLanguage ), $ip, $u->getName(), $np, $wgServer . $wgScript, round( $wgNewPasswordExpiry / 86400 ) ); - $result = $u->sendMail( wfMsg( $emailTitle ), $m ); + $result = $u->sendMail( wfMsgExt( $emailTitle, array( 'parsemag', 'language' => $userLanguage ) ), $m ); return $result; } -- 2.20.1