From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 2 May 2006 20:05:25 +0000 (+0000)
Subject: Add 'EmailConfirmed' hook
X-Git-Tag: 1.31.0-rc.0~57267
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=6d3ef283ec3128bf4e0d435499d7731d324995b9;p=lhc%2Fweb%2Fwiklou.git

Add 'EmailConfirmed' hook
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c3e7077fef..ea9ae28f42 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -187,6 +187,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5789) Treat "loginreqpagetext" as wikitext
 * Sanitizer: now handles nested <li> in <ul> or <ol>
 * (bug 5796) We require MySQL >=4.0.14
+* Add 'EmailConfirmed' hook
 
 == Compatibility ==
 
diff --git a/includes/User.php b/includes/User.php
index bd8b06c4bc..8c89cc3df7 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -288,7 +288,7 @@ class User {
 			(false !== strpos( $addr, '@' ) );
 	}
 
-	/**
+	/**f
 	 * Count the number of edits of a user
 	 *
 	 * @param int $uid The user ID to check
@@ -1850,13 +1850,18 @@ class User {
 	function isEmailConfirmed() {
 		global $wgEmailAuthentication;
 		$this->loadFromDatabase();
-		if( $this->isAnon() )
-			return false;
-		if( !$this->isValidEmailAddr( $this->mEmail ) )
-			return false;
-		if( $wgEmailAuthentication && !$this->getEmailAuthenticationTimestamp() )
-			return false;
-		return true;
+		$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;
+		}
 	}
 
 	/**