Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183601
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: I7b37295e8862b188d1f3b0cd07f66ac34629678d
---
M TwitterCards.hooks.php
1 file changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwitterCards
refs/changes/01/183601/1
diff --git a/TwitterCards.hooks.php b/TwitterCards.hooks.php
index 338d1fd..55b3f54 100644
--- a/TwitterCards.hooks.php
+++ b/TwitterCards.hooks.php
@@ -89,10 +89,20 @@
);
$api->execute();
- $data = $api->getResult()->getData();
- $pageData = $data['query']['pages'][$title->getArticleID()];
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $pageData = $api->getResult()->getResultData(
+ array( 'query', 'pages', $title->getArticleID()
)
+ );
+ $contentKey = isset(
$pageData['extract'][ApiResult::META_CONTENT] )
+ ? $pageData['extract'][ApiResult::META_CONTENT]
+ : '*';
+ } else {
+ $data = $api->getResult()->getData();
+ $pageData =
$data['query']['pages'][$title->getArticleID()];
+ $contentKey = '*';
+ }
- $meta['twitter:description'] = $pageData['extract']['*'];
+ $meta['twitter:description'] =
$pageData['extract'][$contentKey];
if ( isset( $pageData['thumbnail'] ) ) { // not all pages have
images or extension isn't installed
$meta['twitter:image'] =
$pageData['thumbnail']['source'];
}
@@ -100,4 +110,4 @@
self::addMetaData( $meta, $out );
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/183601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwitterCards
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
