X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialConfirmemail.php;h=5ed33e052c4d85584e319ef9d6b33e4eea983aa5;hb=3301e78e5a2e5662952c0564f830a492743f9844;hp=ea26ada08aa927abe724c63a2a17ccbeec1831b2;hpb=764cfa7d85ddfae9f23abd94c3d416fc4680ed0b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index ea26ada08a..5ed33e052c 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Implements Special:Confirmemail and Special:Invalidateemail
+ * Implements Special:Confirmemail
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,10 @@ class EmailConfirmation extends UnlistedSpecialPage {
 		parent::__construct( 'Confirmemail', 'editmyprivateinfo' );
 	}
 
+	public function doesWrites() {
+		return true;
+	}
+
 	/**
 	 * Main execution point
 	 *
@@ -162,49 +166,3 @@ class EmailConfirmation extends UnlistedSpecialPage {
 		}
 	}
 }
-
-/**
- * Special page allows users to cancel an email confirmation using the e-mail
- * confirmation code
- *
- * @ingroup SpecialPage
- */
-class EmailInvalidation extends UnlistedSpecialPage {
-	public function __construct() {
-		parent::__construct( 'Invalidateemail', 'editmyprivateinfo' );
-	}
-
-	function execute( $code ) {
-		// Ignore things like master queries/connections on GET requests.
-		// It's very convenient to just allow formless link usage.
-		Profiler::instance()->getTransactionProfiler()->resetExpectations();
-
-		$this->setHeaders();
-		$this->checkReadOnly();
-		$this->checkPermissions();
-		$this->attemptInvalidate( $code );
-	}
-
-	/**
-	 * Attempt to invalidate the user's email address and show success or failure
-	 * as needed; if successful, link to main page
-	 *
-	 * @param string $code Confirmation code
-	 */
-	function attemptInvalidate( $code ) {
-		$user = User::newFromConfirmationCode( $code, User::READ_LATEST );
-		if ( !is_object( $user ) ) {
-			$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
-
-			return;
-		}
-
-		$user->invalidateEmail();
-		$user->saveSettings();
-		$this->getOutput()->addWikiMsg( 'confirmemail_invalidated' );
-
-		if ( !$this->getUser()->isLoggedIn() ) {
-			$this->getOutput()->returnToMain();
-		}
-	}
-}