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

Merge "Rename $ceAllowConfirmedEmail to $wgAllowConfirmedEmail"

Browse source
This commit is contained in:
jenkins-bot 2017-04-17 17:45:30 +00:00 committed by Gerrit Code Review
parent 306afc6506 37f2dcfd23
commit b36abe69a8
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
extension.json
View file

@ -91,11 +91,10 @@
}
},
"config": {
"_prefix": "",
"wgCaptchaWhitelistIP": false,
"wgCaptcha": null,
"wgCaptchaClass": "SimpleCaptcha",
"wgCaptchaTriggers": {
"CaptchaWhitelistIP": false,
"Captcha": null,
"CaptchaClass": "SimpleCaptcha",
"CaptchaTriggers": {
"edit": false,
"create": false,
"sendemail": false,
@ -105,18 +104,18 @@
"badloginperuser": true,
"_merge_strategy": "array_plus"
},
"wgCaptchaTriggersOnNamespace": {
"CaptchaTriggersOnNamespace": {
"_merge_strategy": "array_plus_2d"
},
"wgCaptchaStorageClass": "CaptchaSessionStore",
"wgCaptchaSessionExpiration": 1800,
"wgCaptchaBadLoginExpiration": 300,
"wgCaptchaBadLoginPerUserExpiration": 600,
"ceAllowConfirmedEmail": false,
"wgCaptchaBadLoginAttempts": 3,
"wgCaptchaBadLoginPerUserAttempts": 20,
"wgCaptchaWhitelist": false,
"wgCaptchaRegexes": []
"CaptchaStorageClass": "CaptchaSessionStore",
"CaptchaSessionExpiration": 1800,
"CaptchaBadLoginExpiration": 300,
"CaptchaBadLoginPerUserExpiration": 600,
"AllowConfirmedEmail": false,
"CaptchaBadLoginAttempts": 3,
"CaptchaBadLoginPerUserAttempts": 20,
"CaptchaWhitelist": false,
"CaptchaRegexes": []
},
"manifest_version": 1
}

14
includes/ConfirmEditHooks.php
View file

@ -87,12 +87,24 @@ class ConfirmEditHooks {
* Set up $wgWhitelistRead
*/
public static function confirmEditSetup() {
global $wgCaptchaTriggers, $wgWikimediaJenkinsCI;
// @codingStandardsIgnoreStart MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
global $wgCaptchaTriggers, $wgWikimediaJenkinsCI, $ceAllowConfirmedEmail,
$wgAllowConfirmedEmail;
// @codingStandardsIgnoreEnd
// There is no need to run (core) tests with enabled ConfirmEdit - bug T44145
if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI === true ) {
$wgCaptchaTriggers = array_fill_keys( array_keys( $wgCaptchaTriggers ), false );
}
// $ceAllowConfirmedEmail is deprecated and should be replaced by $wgAllowConfirmedEmail.
// For backward-compatibility, keep the value for some time. T162641
if ( isset( $ceAllowConfirmedEmail ) ) {
wfDeprecated(
'Using $ceAllowConfirmedEmail is deprecated, ' .
'please migrate to $wgAllowConfirmedEmail as a replacement.' );
$wgAllowConfirmedEmail = $ceAllowConfirmedEmail;
}
}
/**