http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97989

Revision: 97989
Author:   aaron
Date:     2011-09-24 07:45:29 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Don't bother showing captcha on request account form if user has the 
'skipcaptcha' right

Modified Paths:
--------------
    
trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php

Modified: 
trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php
===================================================================
--- 
trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php
   2011-09-24 07:45:24 UTC (rev 97988)
+++ 
trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php
   2011-09-24 07:45:29 UTC (rev 97989)
@@ -198,9 +198,9 @@
                }
                # FIXME: do this better...
                global $wgConfirmAccountCaptchas, $wgCaptchaClass, 
$wgCaptchaTriggers;
-               if ( $wgConfirmAccountCaptchas && isset( $wgCaptchaClass ) && 
$wgCaptchaTriggers['createaccount'] ) {
-                       global $wgExtensionMessagesFiles;
-
+               if ( $wgConfirmAccountCaptchas && isset( $wgCaptchaClass )
+                       && $wgCaptchaTriggers['createaccount'] && 
!$wgUser->isAllowed( 'skipcaptcha' ) )
+               {
                        $captcha = new $wgCaptchaClass;
                        # Hook point to add captchas
                        $form .= '<fieldset>';
@@ -229,7 +229,7 @@
                        $this->showForm( wfMsgHtml( 'noname' ) );
                        return;
                }
-               # FIXME: Hack! If we don't want them for requests, temporarily 
turn it off!
+               # FIXME: Hack! If we don't want captchas for requests, 
temporarily turn it off!
                global $wgConfirmAccountCaptchas, $wgCaptchaTriggers;
                if ( !$wgConfirmAccountCaptchas && isset( $wgCaptchaTriggers ) 
) {
                        $old = $wgCaptchaTriggers['createaccount'];


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to