| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1199,8 +1199,8 @@ |
| 1200 | 1200 | * array( APCOND_AGE, seconds since registration ), *OR* |
| 1201 | 1201 | * similar constructs defined by extensions. |
| 1202 | 1202 | * |
| 1203 | | - * Note that EMAILCONFIRMED will always be true if $wgEmailAuthentication is |
| 1204 | | - * off! |
| | 1203 | + * If $wgEmailAuthentication is off, APCOND_EMAILCONFIRMED will be true for any |
| | 1204 | + * user who has provided an e-mail address. |
| 1205 | 1205 | */ |
| 1206 | 1206 | $wgAutopromote = array( |
| 1207 | 1207 | 'autoconfirmed' => array( '&', |
| Index: trunk/phase3/includes/Autopromote.php |
| — | — | @@ -85,8 +85,6 @@ |
| 86 | 86 | switch( $cond[0] ) { |
| 87 | 87 | case APCOND_EMAILCONFIRMED: |
| 88 | 88 | if( User::isValidEmailAddr( $user->getEmail() ) ) { |
| 89 | | - # FIXME: EMAILCONFIRMED is always true if |
| 90 | | - # wgEmailAuthentication if false, this is confusing. |
| 91 | 89 | global $wgEmailAuthentication; |
| 92 | 90 | if( $wgEmailAuthentication ) { |
| 93 | 91 | return $user->getEmailAuthenticationTimestamp() ? true : false; |