wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-11-24 00:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Moved up shouldCheck() short-circuit logic a bit"

Browse source
This commit is contained in:
jenkins-bot 2015-06-22 19:40:46 +00:00 committed by Gerrit Code Review
parent 43cbc978fa e13d31e2ab
commit 78cc7ffd06
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
SimpleCaptcha/Captcha.php Normal file → Executable file
View file

@ -289,6 +289,18 @@ class SimpleCaptcha {
* @return bool true if the captcha should run
*/
function shouldCheck( WikiPage $page, $content, $section, $isContent = false, $oldtext = null ) {
global $wgUser, $ceAllowConfirmedEmail;
if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
wfDebug( "ConfirmEdit: user group allows skipping captcha\n" );
return false;
} elseif ( $this->isIPWhitelisted() ) {
return false;
} elseif ( $ceAllowConfirmedEmail && $wgUser->isEmailConfirmed() ) {
wfDebug( "ConfirmEdit: user has confirmed mail, skipping captcha\n" );
return false;
}
$title = $page->getTitle();
$this->trigger = '';
@ -311,22 +323,6 @@ class SimpleCaptcha {
$isEmpty = $content === '';
}
global $wgUser;
if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
wfDebug( "ConfirmEdit: user group allows skipping captcha\n" );
return false;
}
if ( $this->isIPWhitelisted() )
return false;
global $wgEmailAuthentication, $ceAllowConfirmedEmail;
if ( $wgEmailAuthentication && $ceAllowConfirmedEmail &&
$wgUser->isEmailConfirmed() ) {
wfDebug( "ConfirmEdit: user has confirmed mail, skipping captcha\n" );
return false;
}
if ( $this->captchaTriggers( $title, 'edit' ) ) {
// Check on all edits
global $wgUser;