jenkins-bot has submitted this change and it was merged.
Change subject: Avoid infinite fallback loops
......................................................................
Avoid infinite fallback loops
Follow-up to I144dacaf36
Change-Id: I72868fb866c53388bb839990b0bb303358410126
---
M includes/AnalysisConfigBuilder.php
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AnalysisConfigBuilder.php
b/includes/AnalysisConfigBuilder.php
index 539d0c4..e04f79b 100644
--- a/includes/AnalysisConfigBuilder.php
+++ b/includes/AnalysisConfigBuilder.php
@@ -206,13 +206,12 @@
return $this->elasticsearchLanguageAnalyzers[
$this->language ];
}
- // Try the fallback chain, unless we hit english
- $code = Language::getFallbackFor( $this->language );
- while ( $code && $code != 'en' ) {
- if ( array_key_exists( $code,
$this->elasticsearchLanguageAnalyzers ) ) {
+ // Try the fallback chain, excluding English
+ $languages = Language::getFallbacksFor( $this->language );
+ foreach ( $languages as $code ) {
+ if ( $code !== 'en' && array_key_exists( $code,
$this->elasticsearchLanguageAnalyzers ) ) {
return $this->elasticsearchLanguageAnalyzers[
$code ];
}
- $code = Language::getFallbackFor( $code );
}
return 'default';
--
To view, visit https://gerrit.wikimedia.org/r/118724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72868fb866c53388bb839990b0bb303358410126
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
