From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Sun, 10 Jan 2010 10:40:12 +0000 (+0000)
Subject: * Send new password e-mail in users preference language
X-Git-Tag: 1.31.0-rc.0~38334
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=7f596d7097e0eaa76886b2e59903fd9dac8f3fed;p=lhc%2Fweb%2Fwiklou.git

* Send new password e-mail in users preference language
---

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;
 	}