jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348224 )
Change subject: Rename $ceAllowConfirmedEmail to $wgAllowConfirmedEmail ...................................................................... Rename $ceAllowConfirmedEmail to $wgAllowConfirmedEmail The value of $ceAllowConfirmedEmail is copied to $wgAllowConfirmedEmail if set in LocalSettings.php for backward-compatibility. However, a deprecation warning is emitted in this case. Bug: T162641 Change-Id: If4daf6f25f0d2b2c0f1e173ee3903063a39978bb --- M extension.json M includes/ConfirmEditHooks.php 2 files changed, 27 insertions(+), 16 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 8289d0e..61ec7af 100644 --- a/extension.json +++ b/extension.json @@ -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 } diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php index 71ffee9..a77638b 100644 --- a/includes/ConfirmEditHooks.php +++ b/includes/ConfirmEditHooks.php @@ -87,12 +87,24 @@ * 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; + } } /** -- To view, visit https://gerrit.wikimedia.org/r/348224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4daf6f25f0d2b2c0f1e173ee3903063a39978bb Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/ConfirmEdit Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits