jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388687 )
Change subject: Remove code for MW < 1.29
......................................................................
Remove code for MW < 1.29
Change-Id: I67381a00741284b1d0ea48b133efbd046cf702f5
---
M includes/GlobalBlocking.class.php
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalBlocking.class.php
b/includes/GlobalBlocking.class.php
index 3946ff1..f2c5258 100644
--- a/includes/GlobalBlocking.class.php
+++ b/includes/GlobalBlocking.class.php
@@ -85,13 +85,6 @@
// Allow site customization of blocked message.
Hooks::run( $hookName, [ &$errorMsg ] );
- if ( !method_exists( 'ApiBase', 'dieWithError' ) ) {
- // No longer needed/possible in MW 1.29
- ApiBase::$messageMap[$errorMsg] = [
- 'code' => $errorMsg,
- 'info' => $apiErrorInfo,
- ];
- }
return $result = [
'block' => $block,
'error' => [
@@ -124,13 +117,6 @@
// Allow site customization of blocked
message.
$blockedIpXffMsg =
'globalblocking-ipblocked-xff';
Hooks::run(
'GlobalBlockingBlockedIpXffMsg', [ &$blockedIpXffMsg ] );
- if ( !method_exists( 'ApiBase',
'dieWithError' ) ) {
- // No longer needed/possible in
MW 1.29
-
ApiBase::$messageMap[$blockedIpXffMsg] = [
- 'code' =>
$blockedIpXffMsg,
- 'info' => 'One or more
proxy servers used by your request has been globally blocked',
- ];
- }
return $result = [
'block' => $block,
'error' => [
--
To view, visit https://gerrit.wikimedia.org/r/388687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67381a00741284b1d0ea48b133efbd046cf702f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
