Tweak wrong comment from last commit, as VasilievVV points out.

diff --git a/includes/Autopromote.php b/includes/Autopromote.php
index 4220bd9..76d6f2a 100644 (file)
--- 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 44076b4..2164604 100644 (file)
--- 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( '&',