jenkins-bot has submitted this change and it was merged.
Change subject: Remove superfluous $languages !== null checks in
EntityRetrievingTermLookup
......................................................................
Remove superfluous $languages !== null checks in EntityRetrievingTermLookup
No longer needed after 178b6f8800d7d98f8841349e45b85e7639823703
Change-Id: Iefb07fcd70c13ff781a1abe5e3773d8838c84678
---
M lib/includes/store/EntityRetrievingTermLookup.php
1 file changed, 2 insertions(+), 10 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/EntityRetrievingTermLookup.php
b/lib/includes/store/EntityRetrievingTermLookup.php
index b8f4515..92a70e1 100644
--- a/lib/includes/store/EntityRetrievingTermLookup.php
+++ b/lib/includes/store/EntityRetrievingTermLookup.php
@@ -57,11 +57,7 @@
public function getLabels( EntityId $entityId, array $languages ) {
$labels = $this->getFingerprint( $entityId
)->getLabels()->toTextArray();
- if ( $languages !== null ) {
- $labels = array_intersect_key( $labels, array_flip(
$languages ) );
- }
-
- return $labels;
+ return array_intersect_key( $labels, array_flip( $languages ) );
}
/**
@@ -89,11 +85,7 @@
public function getDescriptions( EntityId $entityId, array $languages )
{
$descriptions = $this->getFingerprint( $entityId
)->getDescriptions()->toTextArray();
- if ( $languages !== null ) {
- $descriptions = array_intersect_key( $descriptions,
array_flip( $languages ) );
- }
-
- return $descriptions;
+ return array_intersect_key( $descriptions, array_flip(
$languages ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/190454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefb07fcd70c13ff781a1abe5e3773d8838c84678
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Adrian Lang <adrian.he...@wikimedia.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
