Revert 14035: new feature in release branch, and doesn't even compile1.6.4

3 files changed, 8 insertions, 20 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a99bab092b89..90fdad485f18 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -48,7 +48,6 @@ May 2, 2006
 * (bug 5723) Don't count pages linked to from the MediaWiki namespace as "wanted"
 * (bug 5789) Treat "loginreqpagetext" as wikitext
 * (bug 5796) We require MySQL >=4.0.14
-* Add 'EmailConfirmed' hook
 
 == MediaWiki 1.6.3 ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 17595247b924..64dce31ce07f 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -297,12 +297,6 @@ $user: the user _doing_ the block (not the one being blocked)
 $block: the Block object that was saved
 $user: the user who did the block (not the one being blocked)
 
-'EmailConfirmed': When checking that the user's email address is "confirmed"
-$user: User being checked
-$confirmed: Whether or not the email address is confirmed
-This runs before the other checks, such as anonymity and the real check; return
-true to allow those checks to occur, and false if checking is done.
-
 'EmailUser': before sending email from one user to another
 $to: address of receiving user
 $from: address of sending user
diff --git a/includes/User.php b/includes/User.php
index b5138a9ec123..eec9b9f4c2b5 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -259,7 +259,7 @@ class User {
 			(false !== strpos( $addr, '@' ) );
 	}
 
-	/**f
+	/**
 	 * Count the number of edits of a user
 	 *
 	 * @param int $uid The user ID to check
@@ -1821,18 +1821,13 @@ class User {
 	function isEmailConfirmed() {
 		global $wgEmailAuthentication;
 		$this->loadFromDatabase();
-		$confirmed = true;
-		if( wfRunHooks( 'EmailConfirmed', array( &$this, &$confirmed ) ) ) {
-			if( $this->isAnon() )
-				return false;
-			if( !$this->isValidEmailAddr( $this->mEmail ) )
-				return false;
-			if( $wgEmailAuthentication && !$this->getEmailAuthenticationTimestamp() )
-				return false;
-			return true;
-		else {
-			return $confirmed;
-		}
+		if( $this->isAnon() )
+			return false;
+		if( !$this->isValidEmailAddr( $this->mEmail ) )
+			return false;
+		if( $wgEmailAuthentication && !$this->getEmailAuthenticationTimestamp() )
+			return false;
+		return true;
 	}
 
 	/**