From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 5 Aug 2012 14:49:03 +0000 (+0200)
Subject: Support GENDER in 'passwordreset-emailelement'.
X-Git-Tag: 1.31.0-rc.0~22843
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=0f0f784a79040cb288972099cc5170c20fc53c3e;p=lhc%2Fweb%2Fwiklou.git

Support GENDER in 'passwordreset-emailelement'.

Change-Id: I1b14dbb8d1fb06c688064af4a6a02e03293dc5f0
---

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 51520c89a7..efb5765768 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -238,7 +238,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 			$user->setNewpassword( $password );
 			$user->saveSettings();
 			$passwords[] = $this->msg( 'passwordreset-emailelement', $user->getName(), $password
-				)->inLanguage( $userLanguage )->plain(); // We'll escape the whole thing later
+				)->inLanguage( $userLanguage )->text(); // We'll escape the whole thing later
 		}
 		$passwordBlock = implode( "\n\n", $passwords );
 
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index c9964fc831..bbc13acd1a 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -863,9 +863,9 @@ Parameters:
 * $2 - message {{msg-mw|passwordreset-emailelement|notext=1}} repeated $3 times
 * $3 - the number of repetitions in $2
 * $4 - base URL of the wiki',
-'passwordreset-emailelement' => "This is a body of a reminder email to allow them into the system with a new password.
-$1 will be the user's login name.
-$2 will be the temporary password given by the system.",
+'passwordreset-emailelement' => "This is a body of a reminder email to allow them into the system with a new password. Parameters:
+* $1 will be the user's login name. This parameter can be used for GENDER.
+* $2 will be the temporary password given by the system.",
 'passwordreset-emailerror-capture' => 'Error message displayed when sending an e-mail fails. Parameters:
 * $1 is the name of a user who was supposed to get the e-mail.',