[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Remove pre-1.25 API compatibility code

[jenkins-bot (Code Review)]

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.

Change-Id: Ibcbc065f09f863014389d3a28ca0ae9134c88f78
---
M ApiThank.php
M SpecialThanks.php
2 files changed, 1 insertion(+), 10 deletions(-)

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



diff --git a/ApiThank.php b/ApiThank.php
index 67bf6e1..23ec8f4 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -90,8 +90,4 @@
public function isWriteMode() {
return true;
}
-
-   public function getTokenSalt() {
-   return '';
-   }
 }
diff --git a/SpecialThanks.php b/SpecialThanks.php
index 1146cdc..36aed90 100644
--- a/SpecialThanks.php
+++ b/SpecialThanks.php
@@ -150,12 +150,7 @@
return $this->handleErrorCodes( $e->getCodeString() );
}
 
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   $this->result = $api->getResult()->getResultData( [ 
'result' ] );
-   } else {
-   $result = $api->getResult()->getData();
-   $this->result = $result['result'];
-   }
+   $this->result = $api->getResult()->getResultData( [ 'result' ] 
);
return Status::newGood();
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcbc065f09f863014389d3a28ca0ae9134c88f78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Remove pre-1.25 API compatibility code

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311796

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.

Change-Id: Ibcbc065f09f863014389d3a28ca0ae9134c88f78
---
M ApiThank.php
M SpecialThanks.php
2 files changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/96/311796/1

diff --git a/ApiThank.php b/ApiThank.php
index 67bf6e1..23ec8f4 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -90,8 +90,4 @@
public function isWriteMode() {
return true;
}
-
-   public function getTokenSalt() {
-   return '';
-   }
 }
diff --git a/SpecialThanks.php b/SpecialThanks.php
index 1146cdc..36aed90 100644
--- a/SpecialThanks.php
+++ b/SpecialThanks.php
@@ -150,12 +150,7 @@
return $this->handleErrorCodes( $e->getCodeString() );
}
 
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   $this->result = $api->getResult()->getResultData( [ 
'result' ] );
-   } else {
-   $result = $api->getResult()->getData();
-   $this->result = $result['result'];
-   }
+   $this->result = $api->getResult()->getResultData( [ 'result' ] 
);
return Status::newGood();
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcbc065f09f863014389d3a28ca0ae9134c88f78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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