From f1e64bbca843d0b706cd65fb2662962cb48f2cff Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 7 Aug 2008 17:05:10 +0000 Subject: [PATCH] * (bug 12142) CAPTCHA group exceptions only apply to edits Applies the 'skipcaptcha' permission check also to the user creation form. Patch by Emufarmers - https://bugzilla.wikimedia.org/attachment.cgi?id=5132 --- ConfirmEdit_body.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ConfirmEdit_body.php b/ConfirmEdit_body.php index cd68f5cb6..9e451ab1f 100644 --- a/ConfirmEdit_body.php +++ b/ConfirmEdit_body.php @@ -145,8 +145,12 @@ class SimpleCaptcha { * @return bool true to keep running callbacks */ function injectUserCreate( &$template ) { - global $wgCaptchaTriggers, $wgOut; + global $wgCaptchaTriggers, $wgOut, $wgUser; if( $wgCaptchaTriggers['createaccount'] ) { + if( $wgUser->isAllowed( 'skipcaptcha' ) ) { + wfDebug( "ConfirmEdit: user group allows skipping captcha on account creation\n" ); + return true; + } $template->set( 'header', "
" . $wgOut->parse( $this->getMessage( 'createaccount' ) ) . @@ -513,8 +517,12 @@ class SimpleCaptcha { * @return bool true to continue, false to abort user creation */ function confirmUserCreate( $u, &$message ) { - global $wgCaptchaTriggers; + global $wgCaptchaTriggers, $wgUser; if( $wgCaptchaTriggers['createaccount'] ) { + if( $wgUser->isAllowed( 'skipcaptcha' ) ) { + wfDebug( "ConfirmEdit: user group allows skipping captcha on account creation\n" ); + return true; + } $this->trigger = "new account '" . $u->getName() . "'"; if( !$this->passCaptcha() ) { $message = wfMsg( 'captcha-createaccount-fail' );