jenkins-bot has submitted this change and it was merged.
Change subject: Check array keys before adding fallbacks in ResultBuilder
......................................................................
Check array keys before adding fallbacks in ResultBuilder
it could be via api props, that someone requests just labels
and not descriptions. and then perhaps descriptions array key
is missing and we should check for that.
Bug: T109603
Change-Id: If9239a17879a506776d5364d7bbf062d005e915c
---
M repo/includes/api/ResultBuilder.php
1 file changed, 14 insertions(+), 8 deletions(-)
Approvals:
20after4: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/repo/includes/api/ResultBuilder.php
b/repo/includes/api/ResultBuilder.php
index ec09fa9..d08c5c6 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -475,14 +475,20 @@
array $serialization,
array $fallbackChains
) {
- $serialization['labels'] =
$this->getTermsSerializationWithFallbackInfo(
- $serialization['labels'],
- $fallbackChains
- );
- $serialization['descriptions'] =
$this->getTermsSerializationWithFallbackInfo(
- $serialization['descriptions'],
- $fallbackChains
- );
+ if ( isset( $serialization['labels'] ) ) {
+ $serialization['labels'] =
$this->getTermsSerializationWithFallbackInfo(
+ $serialization['labels'],
+ $fallbackChains
+ );
+ }
+
+ if ( isset( $serialization['descriptions'] ) ) {
+ $serialization['descriptions'] =
$this->getTermsSerializationWithFallbackInfo(
+ $serialization['descriptions'],
+ $fallbackChains
+ );
+ }
+
return $serialization;
}
--
To view, visit https://gerrit.wikimedia.org/r/232541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9239a17879a506776d5364d7bbf062d005e915c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf19
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
