| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -142,7 +142,7 @@ |
| 143 | 143 | return; |
| 144 | 144 | } |
| 145 | 145 | # No request spamming... |
| 146 | | - if( $wgAccountRequestThrottle && ( !method_exists($u,'isPingLimitable') || $wgUser->isPingLimitable() ) ) { |
| | 146 | + if( $wgAccountRequestThrottle && ( !method_exists($wgUser,'isPingLimitable') || $wgUser->isPingLimitable() ) ) { |
| 147 | 147 | $key = wfMemcKey( 'acctrequest', 'ip', wfGetIP() ); |
| 148 | 148 | $value = $wgMemc->get( $key ); |
| 149 | 149 | if( $value > $wgAccountRequestThrottle ) { |
| — | — | @@ -220,16 +220,12 @@ |
| 221 | 221 | $dbw->commit(); |
| 222 | 222 | # No request spamming... |
| 223 | 223 | # BC: check if isPingLimitable() exists |
| 224 | | - if( $wgAccountRequestThrottle && ( !method_exists($u,'isPingLimitable') || $wgUser->isPingLimitable() ) ) { |
| | 224 | + if( $wgAccountRequestThrottle && ( !method_exists($wgUser,'isPingLimitable') || $wgUser->isPingLimitable() ) ) { |
| 225 | 225 | $key = wfMemcKey( 'acctrequest', 'ip', wfGetIP() ); |
| 226 | 226 | $value = $wgMemc->incr( $key ); |
| 227 | 227 | if( !$value ) { |
| 228 | 228 | $wgMemc->set( $key, 1, 86400 ); |
| 229 | 229 | } |
| 230 | | - if( $value > $wgAccountRequestThrottle ) { |
| 231 | | - $this->throttleHit( $wgAccountRequestThrottle ); |
| 232 | | - return; |
| 233 | | - } |
| 234 | 230 | } |
| 235 | 231 | # Done! |
| 236 | 232 | $this->showSuccess(); |