Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183593
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 PageImages.body.php
1 file changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/93/183593/1
diff --git a/PageImages.body.php b/PageImages.body.php
index b3ca0fb..bc3ea57 100644
--- a/PageImages.body.php
+++ b/PageImages.body.php
@@ -288,11 +288,17 @@
}
$api = new ApiMain( new FauxRequest( $request ) );
$api->execute();
- $data = $api->getResultData();
- if ( isset( $data['query']['pages'] ) ) {
- return $data['query']['pages'];
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ return ApiResult::removeMetadataNonRecursive(
+ (array)$api->getResult()->getResultData( array(
'query', 'pages' ) )
+ );
+ } else {
+ $data = $api->getResultData();
+ if ( isset( $data['query']['pages'] ) ) {
+ return $data['query']['pages'];
+ }
+ return array();
}
- return array();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/183593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
