Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183611
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 FeedSMItem.php
1 file changed, 11 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleNewsSitemap
refs/changes/11/183611/1
diff --git a/FeedSMItem.php b/FeedSMItem.php
index fbbb1b8..91fd244 100644
--- a/FeedSMItem.php
+++ b/FeedSMItem.php
@@ -103,11 +103,19 @@
) );
$main = new ApiMain( $req );
$main->execute();
- $data = $main->getResultData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $main->getResult()->getResultData();
+ $contentKey = isset(
$data['parse']['text'][ApiResult::META_CONTENT] )
+ ?
$data['parse']['text'][ApiResult::META_CONTENT]
+ : '*';
+ } else {
+ $data = $main->getResultData();
+ $contentKey = '*';
+ }
- if ( isset( $data['parse']['text']['*'] ) ) {
+ if ( isset( $data['parse']['text'][$contentKey] ) ) {
$result = $this->xmlEncode(
- $data['parse']['text']['*']
+ $data['parse']['text'][$contentKey]
);
}
wfProfileOut( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/183611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleNewsSitemap
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
