From e8d66e8eb3bba0dc87b46393bd9a10867085c076 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 27 Sep 2014 20:45:55 +0200 Subject: [PATCH] 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 --- includes/specials/SpecialChangeEmail.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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; -- 2.20.1