Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183594
Change subject: Update ApiResult handling for mediawiki/core change I7b37295e
......................................................................
Update ApiResult handling for mediawiki/core change I7b37295e
Change I7b37295e for mediawiki/core deprecates several methods, and more
importantly changes the format of the data returned from
ApiResult::getData(). This change should handle these differences in a
backwards-compatible manner.
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
---
M ApiQueryProofread.php
M ProofreadPage.body.php
2 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/94/183594/1
diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index 924be02..f81f2ae 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -64,7 +64,15 @@
$api = new ApiMain($params);
$api->execute();
- $data = $api->getResultData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $api->getResult()->getResultData();
+ $pages = ApiResult::removeMetadataNonRecursive(
+ (array)$data['query']['pages']
+ );
+ } else {
+ $data = $api->getResultData();
+ $pages = $data['query']['pages'];
+ }
unset( $api );
if ( array_key_exists( 'error', $data ) ) {
@@ -72,7 +80,7 @@
}
$result = $this->getResult();
- foreach ( $data['query']['pages'] as $pageid => $data) {
+ foreach ( $pages as $pageid => $data) {
if ( !array_key_exists( 'categories', $data ) ) {
continue;
}
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index a2dce50..83714af 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -815,7 +815,11 @@
$api = new ApiMain( $params );
$api->execute();
- $data = $api->getResultData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $api->getResult()->getResultData();
+ } else {
+ $data = $api->getResultData();
+ }
unset( $api );
if ( array_key_exists( 'error', $data ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/183594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
