From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Sat, 27 Sep 2014 18:45:55 +0000 (+0200)
Subject: Remove dead code after removal of cancel button on Special:ChangeEmail
X-Git-Tag: 1.31.0-rc.0~13784^2
X-Git-Url: http://git.cyclocoop.org/data/File:Image2.gif?a=commitdiff_plain;h=e8d66e8eb3bba0dc87b46393bd9a10867085c076;p=lhc%2Fweb%2Fwiklou.git

Remove dead code after removal of cancel button on Special:ChangeEmail

Since the removal of the cancel button, the "wpCancel" parameter
cannot be present anymore, thus this check is now unneccessary.

Change-Id: Id72b29484554989ce8a639f2e0d3ecc07622edad
---

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index e0be838b81..f5df54eeec 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -116,12 +116,8 @@ class SpecialChangeEmail extends FormSpecialPage {
 	}
 
 	public function onSubmit( array $data ) {
-		if ( $this->getRequest()->getBool( 'wpCancel' ) ) {
-			$status = Status::newGood( true );
-		} else {
-			$password = isset( $data['Password'] ) ? $data['Password'] : null;
-			$status = $this->attemptChange( $this->getUser(), $password, $data['NewEmail'] );
-		}
+		$password = isset( $data['Password'] ) ? $data['Password'] : null;
+		$status = $this->attemptChange( $this->getUser(), $password, $data['NewEmail'] );
 
 		$this->status = $status;