| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php |
| — | — | @@ -198,9 +198,9 @@ |
| 199 | 199 | } |
| 200 | 200 | # FIXME: do this better... |
| 201 | 201 | global $wgConfirmAccountCaptchas, $wgCaptchaClass, $wgCaptchaTriggers; |
| 202 | | - if ( $wgConfirmAccountCaptchas && isset( $wgCaptchaClass ) && $wgCaptchaTriggers['createaccount'] ) { |
| 203 | | - global $wgExtensionMessagesFiles; |
| 204 | | - |
| | 202 | + if ( $wgConfirmAccountCaptchas && isset( $wgCaptchaClass ) |
| | 203 | + && $wgCaptchaTriggers['createaccount'] && !$wgUser->isAllowed( 'skipcaptcha' ) ) |
| | 204 | + { |
| 205 | 205 | $captcha = new $wgCaptchaClass; |
| 206 | 206 | # Hook point to add captchas |
| 207 | 207 | $form .= '<fieldset>'; |
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | $this->showForm( wfMsgHtml( 'noname' ) ); |
| 231 | 231 | return; |
| 232 | 232 | } |
| 233 | | - # FIXME: Hack! If we don't want them for requests, temporarily turn it off! |
| | 233 | + # FIXME: Hack! If we don't want captchas for requests, temporarily turn it off! |
| 234 | 234 | global $wgConfirmAccountCaptchas, $wgCaptchaTriggers; |
| 235 | 235 | if ( !$wgConfirmAccountCaptchas && isset( $wgCaptchaTriggers ) ) { |
| 236 | 236 | $old = $wgCaptchaTriggers['createaccount']; |