jenkins-bot has submitted this change and it was merged.

Change subject: Remove pre-1.25 API compatibility code
......................................................................


Remove pre-1.25 API compatibility code

Since this extension uses extension.json, it already requires 1.25+ so
no need to keep the old code around.

Depends-On: Ia8306ec25e63adcdcf0dcc8f6a700dd01afdc948
Change-Id: I66f6876d989e45f7d6bca0eb9cd9652dea882ff3
---
M includes/api/ApiDeleteGlobalAccount.php
M includes/api/ApiSetGlobalAccountStatus.php
2 files changed, 2 insertions(+), 10 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/ApiDeleteGlobalAccount.php 
b/includes/api/ApiDeleteGlobalAccount.php
index fa58281..ecfc66f 100644
--- a/includes/api/ApiDeleteGlobalAccount.php
+++ b/includes/api/ApiDeleteGlobalAccount.php
@@ -51,11 +51,7 @@
                                'reason' => $params['reason']
                        ) );
                } else {
-                       if ( is_callable( array( $this, 'getErrorFormatter' ) ) 
) {
-                               $error = 
$this->getErrorFormatter()->arrayFromStatus( $status );
-                       } else {
-                               $error = 
$this->getResult()->convertStatusToArray( $status );
-                       }
+                       $error = $this->getErrorFormatter()->arrayFromStatus( 
$status );
                        $this->getResult()->addValue( 'error', null, $error );
                }
        }
diff --git a/includes/api/ApiSetGlobalAccountStatus.php 
b/includes/api/ApiSetGlobalAccountStatus.php
index 8728df9..7a67682 100644
--- a/includes/api/ApiSetGlobalAccountStatus.php
+++ b/includes/api/ApiSetGlobalAccountStatus.php
@@ -75,11 +75,7 @@
                                'reason' => $reason
                        ) );
                } else {
-                       if ( is_callable( array( $this, 'getErrorFormatter' ) ) 
) {
-                               $error = 
$this->getErrorFormatter()->arrayFromStatus( $status );
-                       } else {
-                               $error = 
$this->getResult()->convertStatusToArray( $status );
-                       }
+                       $error = $this->getErrorFormatter()->arrayFromStatus( 
$status );
                        $this->getResult()->addValue( 'error', null, $error );
                        $this->getResult()->addValue( null, 
$this->getModuleName(), array(
                                'user' => $globalUser->getName(),

-- 
To view, visit https://gerrit.wikimedia.org/r/311775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I66f6876d989e45f7d6bca0eb9cd9652dea882ff3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to