The EditPage object is not passed by reference in the EditFilter hooks

[toast/cookiecaptcha.git] / ConfirmEdit.php

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 2faac7f0395f83078049b265272beb9cf2318772..7a4f78af63db603c2b50c5c500ed5b3063112b13 100644 (file)
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -35,6 +35,7 @@ global $wgExtensionFunctions, $wgGroupPermissions;
 
 $wgExtensionFunctions[] = 'confirmEditSetup';
 $wgExtensionCredits['other'][] = array(
+       'path' => __FILE__,
        'name' => 'ConfirmEdit',
        'author' => 'Brion Vibber',
        'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
@@ -55,6 +56,7 @@ $wgGroupPermissions['user'         ]['skipcaptcha'] = false;
 $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
 $wgGroupPermissions['bot'          ]['skipcaptcha'] = true; // registered bots
 $wgGroupPermissions['sysop'        ]['skipcaptcha'] = true;
+$wgAvailableRights[] = 'skipcaptcha';
 
 /**
  * List of IP ranges to allow to skip the captcha, similar to the group setting:
@@ -146,6 +148,13 @@ $wgCaptchaBadLoginExpiration = 5 * 60;
 global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 
+/** 
+ * Number of bad login attempts before triggering the captcha.  0 means the
+ * captcha is presented on the first login.
+ */
+global $wgCaptchaBadLoginAttempts;
+$wgCaptchaBadLoginAttempts = 3;
+
 /**
  * Regex to whitelist URLs to known-good sites...
  * For instance:
@@ -170,6 +179,7 @@ $wgSpecialPages['Captcha'] = array( /*class*/'CaptchaSpecialPage', /*name*/'Capt
 
 $wgConfirmEditIP = dirname( __FILE__ );
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";
+$wgExtensionAliasesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";
 
 if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
        $wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';