Update to MediaWiki 1.18.3

1 files changed, 6 insertions, 5 deletions

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 1caa2c51..db5268d6 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -194,18 +194,19 @@ class SpecialPasswordReset extends FormSpecialPage {
 			? 'passwordreset-emailtext-ip'
 			: 'passwordreset-emailtext-user';
 
+		// Send in the user's language; which should hopefully be the same
+		$userLanguage = $firstUser->getOption( 'language' );
+
 		$passwords = array();
 		foreach ( $users as $user ) {
 			$password = $user->randomPassword();
 			$user->setNewpassword( $password );
 			$user->saveSettings();
-			$passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password );
+			$passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password
+				)->inLanguage( $userLanguage )->plain(); // We'll escape the whole thing later
 		}
 		$passwordBlock = implode( "\n\n", $passwords );
 
-		// Send in the user's language; which should hopefully be the same
-		$userLanguage = $firstUser->getOption( 'language' );
-
 		$body = wfMessage( $msg )->inLanguage( $userLanguage );
 		$body->params(
 			$username,
@@ -270,4 +271,4 @@ class SpecialPasswordReset extends FormSpecialPage {
 
 		return false;
 	}
-}
\ No newline at end of file
+}