X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialPasswordReset.php;h=082eed0d0aef743ed2e27c10fd3a89a3c0753f66;hb=b0559c914f4b20d8153f24b37c29b1c87cbf4879;hp=69c40569d0395d75af4aea7baf31973444798fbb;hpb=91e3622c9257427d37592ba630a939a3971c1e48;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 69c40569d0..082eed0d0a 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -105,6 +105,15 @@ class SpecialPasswordReset extends FormSpecialPage {
 	public function alterForm( HTMLForm $form ) {
 		global $wgPasswordResetRoutes;
 
+		$form->setDisplayFormat( 'vform' );
+		// Turn the old-school line around the form off.
+		// XXX This wouldn't be necessary here if we could set the format of
+		// the HTMLForm to 'vform' at its creation, but there's no way to do so
+		// from a FormSpecialPage class.
+		$form->setWrapperLegend( false );
+
+		$form->addHiddenFields( $this->getRequest()->getValues( 'returnto', 'returntoquery' ) );
+
 		$i = 0;
 		if ( isset( $wgPasswordResetRoutes['username'] ) && $wgPasswordResetRoutes['username'] ) {
 			$i++;
@@ -268,7 +277,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 
 		$title = $this->msg( 'passwordreset-emailtitle' );
 
-		$this->result = $firstUser->sendMail( $title->escaped(), $this->email->text() );
+		$this->result = $firstUser->sendMail( $title->text(), $this->email->text() );
 
 		if ( isset( $data['Capture'] ) && $data['Capture'] ) {
 			// Save the user, will be used if an error occurs when sending the email