Ditch wfSpecialConfirmemail(), move Special:Confirmemail to the modern special page...

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index 58e5589..4fee200 100644 (file)
--- 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 fbf7625..4eff196 100644 (file)
--- 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