From 28850007758e6048a71a3f15b662008c16e6b5dc Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Sun, 23 Dec 2007 20:01:53 +0000 Subject: [PATCH] Tweak wrong comment from last commit, as VasilievVV points out. --- includes/Autopromote.php | 2 -- includes/DefaultSettings.php | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/Autopromote.php b/includes/Autopromote.php index 4220bd92cc..76d6f2ac0b 100644 --- a/includes/Autopromote.php +++ b/includes/Autopromote.php @@ -85,8 +85,6 @@ class Autopromote { switch( $cond[0] ) { case APCOND_EMAILCONFIRMED: if( User::isValidEmailAddr( $user->getEmail() ) ) { - # FIXME: EMAILCONFIRMED is always true if - # wgEmailAuthentication if false, this is confusing. global $wgEmailAuthentication; if( $wgEmailAuthentication ) { return $user->getEmailAuthenticationTimestamp() ? true : false; diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 44076b4246..2164604013 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1199,8 +1199,8 @@ $wgAutoConfirmCount = 0; * array( APCOND_AGE, seconds since registration ), *OR* * similar constructs defined by extensions. * - * Note that EMAILCONFIRMED will always be true if $wgEmailAuthentication is - * off! + * If $wgEmailAuthentication is off, APCOND_EMAILCONFIRMED will be true for any + * user who has provided an e-mail address. */ $wgAutopromote = array( 'autoconfirmed' => array( '&', -- 2.20.1