| Index: trunk/extensions/ConfirmAccount/RequestAccount_body.php |
| — | — | @@ -248,7 +248,7 @@ |
| 249 | 249 | $wgCaptchaTriggers['createaccount'] = $old; |
| 250 | 250 | } |
| 251 | 251 | # No request spamming... |
| 252 | | - if ( $wgAccountRequestThrottle && ( !method_exists( $wgUser, 'isPingLimitable' ) || $wgUser->isPingLimitable() ) ) { |
| | 252 | + if ( $wgAccountRequestThrottle && $wgUser->isPingLimitable() ) { |
| 253 | 253 | global $wgMemc; |
| 254 | 254 | $key = wfMemcKey( 'acctrequest', 'ip', wfGetIP() ); |
| 255 | 255 | $value = $wgMemc->get( $key ); |
| — | — | @@ -286,7 +286,8 @@ |
| 287 | 287 | # Check if biography is long enough |
| 288 | 288 | if ( str_word_count( $this->mBio ) < $wgAccountRequestMinWords ) { |
| 289 | 289 | global $wgLang; |
| 290 | | - $this->showForm( wfMsgExt( 'requestaccount-tooshort', 'parsemag', $wgLang->formatNum( $wgAccountRequestMinWords ) ) ); |
| | 290 | + $this->showForm( wfMsgExt( 'requestaccount-tooshort', 'parsemag', |
| | 291 | + $wgLang->formatNum( $wgAccountRequestMinWords ) ) ); |
| 291 | 292 | return; |
| 292 | 293 | } |
| 293 | 294 | # Set some additional data so the AbortNewAccount hook can be |
| — | — | @@ -390,7 +391,7 @@ |
| 391 | 392 | $wgMemc->delete( $key ); |
| 392 | 393 | # No request spamming... |
| 393 | 394 | # BC: check if isPingLimitable() exists |
| 394 | | - if ( $wgAccountRequestThrottle && ( !method_exists( $wgUser, 'isPingLimitable' ) || $wgUser->isPingLimitable() ) ) { |
| | 395 | + if ( $wgAccountRequestThrottle && $wgUser->isPingLimitable() ) { |
| 395 | 396 | $key = wfMemcKey( 'acctrequest', 'ip', wfGetIP() ); |
| 396 | 397 | if ( !$value = $wgMemc->incr( $key ) ) { |
| 397 | 398 | $wgMemc->set( $key, 1, 86400 ); |