From 6a85bf5960852971661111c728ae3866b22fb426 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Fri, 8 Jun 2007 00:52:56 +0000
Subject: [PATCH] Ditch wfSpecialConfirmemail(), move Special:Confirmemail to
 the modern special page loading scheme

---
 includes/SpecialConfirmemail.php | 20 +++++++++-----------
 includes/SpecialPage.php         |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index 58e55899f6..4fee200314 100644
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -1,15 +1,5 @@
 <?php
 
-/**
- * Main execution point
- *
- * @param $par Parameters passed to the page
- */
-function wfSpecialConfirmemail( $par ) {
-	$form = new EmailConfirmation();
-	$form->execute( $par );
-}
-
 /**
  * Special page allows users to request email confirmation message, and handles
  * processing of the confirmation code when the link in the email is followed
@@ -17,7 +7,14 @@ function wfSpecialConfirmemail( $par ) {
  * @addtogroup SpecialPage
  * @author Rob Church <robchur@gmail.com>
  */
-class EmailConfirmation extends SpecialPage {
+class EmailConfirmation extends UnlistedSpecialPage {
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		parent::__construct( 'Confirmemail' );
+	}
 	
 	/**
 	 * Main execution point
@@ -26,6 +23,7 @@ class EmailConfirmation extends SpecialPage {
 	 */
 	function execute( $code ) {
 		global $wgUser, $wgOut;
+		$this->setHeaders();
 		if( empty( $code ) ) {
 			if( $wgUser->isLoggedIn() ) {
 				if( User::isValidEmailAddr( $wgUser->getEmail() ) ) {
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index fbf76259cf..4eff196d9e 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -178,7 +178,7 @@ class SpecialPage
 		}
 
 		if( $wgEmailAuthentication ) {
-			self::$mList['Confirmemail'] = array( 'UnlistedSpecialPage', 'Confirmemail' );
+			self::$mList['Confirmemail'] = 'EmailConfirmation';
 		}
 
 		# Add extension special pages
-- 
2.20.1