jenkins-bot has submitted this change and it was merged.
Change subject: Further cleanup for core API change
......................................................................
Further cleanup for core API change
PS25 and later changed things around a fair bit, meaning the previous update
needs some further updating. In some cases additional cleanup is also necessary
for future core API changes.
Bug: T96595
Change-Id: If9262c4075a08aa636995eb6dec985439d46b5cb
---
M includes/api/ApiFormatJsonMW.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiFormatJsonMW.php b/includes/api/ApiFormatJsonMW.php
index d087043..aa39b4b 100644
--- a/includes/api/ApiFormatJsonMW.php
+++ b/includes/api/ApiFormatJsonMW.php
@@ -38,14 +38,15 @@
}
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $data = $this->getResult()->getResultData();
- $data = ApiResult::transformForBC( $data );
- $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
- $data = ApiResult::removeMetadata( $data );
+ $data = $this->getResult()->getResultData( null, array(
+ 'BC' => array(),
+ 'Types' => array(),
+ 'Strip' => 'all',
+ ) );
} else {
$data = $this->getResultData();
}
-
+
$this->printText(
$prefix .
FormatJson::encode( $data, $this->getIsHtml() ) .
--
To view, visit https://gerrit.wikimedia.org/r/205309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9262c4075a08aa636995eb6dec985439d46b5cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits