Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183581
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 api/FlaggedRevsApi.hooks.php
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs
refs/changes/81/183581/1
diff --git a/api/FlaggedRevsApi.hooks.php b/api/FlaggedRevsApi.hooks.php
index aa279d6..b098a94 100644
--- a/api/FlaggedRevsApi.hooks.php
+++ b/api/FlaggedRevsApi.hooks.php
@@ -25,11 +25,18 @@
// pageid => revid => array_index of the revision
// we will need this later to add data to the result array
$result = $module->getResult();
- $data = $result->getData();
- if ( !isset( $data['query'] ) || !isset(
$data['query']['pages'] ) ) {
- return true;
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = ApiResult::removeMetadata(
+ (array)$result->getResultData( array( 'query',
'pages' ) )
+ );
+ } else {
+ $data = $result->getData();
+ if ( !isset( $data['query'] ) || !isset(
$data['query']['pages'] ) ) {
+ return true;
+ }
+ $data = $data['query']['pages'];
}
- foreach ( $data['query']['pages'] as $pageid => $page ) {
+ foreach ( $data as $pageid => $page ) {
if ( array_key_exists( 'revisions', (array)$page ) ) {
foreach ( $page['revisions'] as $index => $rev
) {
if ( array_key_exists( 'revid',
(array)$rev ) )
--
To view, visit https://gerrit.wikimedia.org/r/183581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
