jenkins-bot has submitted this change and it was merged.
Change subject: No user-specific fallback in wbgetentities.
......................................................................
No user-specific fallback in wbgetentities.
The language fallback we offer in the API should (at least per default)
be consistent with the (cacheable) page content we generate. Using different
modes of fallback, some places taking into account languages from Babel boxes,
others not, is confusing.
Change-Id: Ifbf6828a72a80d74ac306d7c24992bdc20d3b918
---
M repo/includes/api/GetEntities.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 7b7b020..0bce353 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -257,13 +257,19 @@
* @return SerializationOptions
*/
private function getSerializationOptions( $params, $props ){
+ $fallbackMode = (
+ LanguageFallbackChainFactory::FALLBACK_VARIANTS
+ | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ | LanguageFallbackChainFactory::FALLBACK_SELF );
+
$options = new SerializationOptions();
+
if ( $params['languagefallback'] ) {
$languages = array();
foreach ( $params['languages'] as $languageCode ) {
// $languageCode is already filtered as valid
ones
$languages[$languageCode] =
$this->languageFallbackChainFactory
- ->newFromContextAndLanguageCode( $this,
$languageCode );
+ ->newFromLanguageCode( $languageCode,
$fallbackMode );
}
} else {
$languages = $params['languages'];
--
To view, visit https://gerrit.wikimedia.org/r/203814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbf6828a72a80d74ac306d7c24992bdc20d3b918
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
