Revert r38040 "new hook, ConfirmEmailComplete"

This hook is incomplete and won't work as advertised. Will fail to run when the email address is confirmed through other means, such as a password reset; also there's no corresponding hook for when the mail gets *un*confirmed, so would lead to inconsistent state.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 64e8aed..e006157 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,8 +28,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 * (bug 8068) New __INDEX__ and __NOINDEX__ magic words allow user control of
   search engine indexing on a per-article basis.
-* Added ConfirmEmailComplete hook to allow extensions to perform actions
-  depending on if the user's email is confirmed or not
 * Added SpecialMovepageBeforeMove hook to allow extensions to interfere with
   page moves (useful for blacklist-type extensions, for example)
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 9a342de..cbd008c 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -502,9 +502,6 @@ $catpage: CategoryPage instance
 $unpatrolled:  Whether or not we are showing unpatrolled changes.
 $watched:      Whether or not the change is watched by the user.
 
-'ConfirmEmailComplete': Called after a user's email has been confirmed successfully
-&$user: user (object) whose email is being confirmed
-
 'ContribsPager::getQueryInfo': Before the contributions query is about to run
 &$pager: Pager object for contributions
 &queryInfo: The query for the contribs Pager

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index cf20b77..9075fb9 100644 (file)
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -92,7 +92,6 @@ class EmailConfirmation extends UnlistedSpecialPage {
                                $title = SpecialPage::getTitleFor( 'Userlogin' );
                                $wgOut->returnToMain( true, $title );
                        }
-                       wfRunHooks( 'ConfirmEmailComplete', array( &$user ) );
                } else {
                        $wgOut->addWikiMsg( 'confirmemail_invalid' );
                }