X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialChangeEmail.php;h=361b7b1b649b2a87b3b41252b895b551002c2b43;hb=c272c553842d86f4bf1b4b0947769f927f999825;hp=c2aa704ab1b25ef328c6bc05486b818e5d9c35fe;hpb=0bcd8347e597de8d689af1d3c74bb52cafaaf74d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index c2aa704ab1..361b7b1b64 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -92,7 +92,8 @@ class SpecialChangeEmail extends FormSpecialPage {
 			'NewEmail' => array(
 				'type' => 'email',
 				'label-message' => 'changeemail-newemail',
-				'autofocus' => true
+				'autofocus' => true,
+				'help-message' => 'changeemail-newemail-help',
 			),
 		);
 
@@ -115,6 +116,11 @@ class SpecialChangeEmail extends FormSpecialPage {
 		$form->setTableId( 'mw-changeemail-table' );
 		$form->setSubmitTextMsg( 'changeemail-submit' );
 		$form->addHiddenFields( $this->getRequest()->getValues( 'returnto', 'returntoquery' ) );
+
+		$form->addHeaderText( $this->msg( 'changeemail-header' )->parseAsBlock() );
+		if ( $this->getConfig()->get( 'RequirePasswordforEmailChange' ) ) {
+			$form->addHeaderText( $this->msg( 'changeemail-passwordrequired' )->parseAsBlock() );
+		}
 	}
 
 	public function onSubmit( array $data ) {
@@ -160,6 +166,10 @@ class SpecialChangeEmail extends FormSpecialPage {
 			return Status::newFatal( 'invalidemailaddress' );
 		}
 
+		if ( $newaddr === $user->getEmail() ) {
+			return Status::newFatal( 'changeemail-nochange' );
+		}
+
 		$throttleCount = LoginForm::incLoginThrottle( $user->getName() );
 		if ( $throttleCount === true ) {
 			$lang = $this->getLanguage();