Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80790
Change subject: Allow for both ids and sites/titles to be set for wbgetentities
......................................................................
Allow for both ids and sites/titles to be set for wbgetentities
Bug: 43309
Change-Id: I38bddcf3be55d5d8cf4fbdacb1cc73188ee79dd7
---
M repo/includes/api/GetEntities.php
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/90/80790/1
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 64ca636..81b1390 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -57,16 +57,17 @@
$params = $this->extractRequestParams();
- if ( !( isset( $params['ids'] ) XOR ( !empty( $params['sites']
) && !empty( $params['titles'] ) ) ) ) {
+ if ( !( isset( $params['ids'] ) && ( !empty( $params['sites'] )
&& !empty( $params['titles'] ) ) ) ) {
wfProfileOut( __METHOD__ );
$this->dieUsage( 'Either provide the item "ids" or
pairs of "sites" and "titles" for corresponding pages', 'param-missing' );
}
- if ( !isset( $params['ids'] ) ) {
+ if ( isset( $params['sites'] ) ) {
+ // We only need to check if one is defined since we
already checked above
$siteLinkCache =
StoreFactory::getStore()->newSiteLinkCache();
$siteStore = \SiteSQLStore::newInstance();
$itemByTitleHelper = new ItemByTitleHelper( $this,
$siteLinkCache, $siteStore, $this->stringNormalizer );
- $params['ids'] = $itemByTitleHelper->getEntityIds(
$params['sites'], $params['titles'], $params['normalize'] );
+ $params['ids'] = array_merge( $params['ids'],
$itemByTitleHelper->getEntityIds( $params['sites'], $params['titles'],
$params['normalize'] ) );
}
$params['ids'] = $this->uniqueEntities( $params['ids'] );
--
To view, visit https://gerrit.wikimedia.org/r/80790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38bddcf3be55d5d8cf4fbdacb1cc73188ee79dd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
