jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372115 )
Change subject: build: Update mediawiki/mediawiki-codesniffer to 0.11.1
......................................................................
build: Update mediawiki/mediawiki-codesniffer to 0.11.1
Change-Id: Ie1307df0f85cf0ccb7ad24961df7b63005f9c745
---
M SimpleCaptcha/Captcha.php
M composer.json
M includes/ConfirmEditHooks.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
index 661ff7b..c532b95 100644
--- a/SimpleCaptcha/Captcha.php
+++ b/SimpleCaptcha/Captcha.php
@@ -234,7 +234,7 @@
$msg = wfMessage( $name );
// obtain a more tailored message, if possible, otherwise, fall
back to
// the default for edits
- return $msg->isDisabled() ? wfMessage( static::$messagePrefix .
'edit' ) : $msg;
+ return $msg->isDisabled() ? wfMessage( static::$messagePrefix .
'edit' ) : $msg;
}
/**
diff --git a/composer.json b/composer.json
index 55507be..f80e32e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.1",
+ "mediawiki/mediawiki-codesniffer": "0.11.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php
index fc8a540..5fa954b 100644
--- a/includes/ConfirmEditHooks.php
+++ b/includes/ConfirmEditHooks.php
@@ -162,7 +162,7 @@
}
if ( $wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey ==
'' ) {
- die (
+ die(
'You need to set $wgReCaptchaPrivateKey and
$wgReCaptchaPublicKey in LocalSettings.php to ' .
"use the reCAPTCHA plugin. You can sign up for
a key <a href='" .
htmlentities( recaptcha_get_signup_url(
$wgServerName, "mediawiki" ) ) .
--
To view, visit https://gerrit.wikimedia.org/r/372115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1307df0f85cf0ccb7ad24961df7b63005f9c745
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
