jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382605 )
Change subject: Fix errors from secondary language detection
......................................................................
Fix errors from secondary language detection
* Config object takes unprefixed keys, so it was possible
to attempt to fallback to another wiki in same language. For
example enwiki tried to fallback to simplewiki.
* The code to separate $wiki and $prefix from the combined variable
incorrectly had the old code for taking first item. PHP is helpful
enough to turn list($x,$y) = reset(['foo', 'bar']) into $x = 'f' and
$y = 'o'. Thanks!
Bug: T177535
Change-Id: Ib877f3c6f45aba9ddd6e04068bc935dab17ab6b6
---
M includes/BaseInterwikiResolver.php
M includes/CirrusSearch.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BaseInterwikiResolver.php
b/includes/BaseInterwikiResolver.php
index 530b563..adfe95d 100644
--- a/includes/BaseInterwikiResolver.php
+++ b/includes/BaseInterwikiResolver.php
@@ -95,7 +95,7 @@
if ( empty( $wikiAndPrefix ) ) {
return [];
}
- list( $wiki, $prefix ) = reset( $wikiAndPrefix );
+ list( $wiki, $prefix ) = $wikiAndPrefix;
return [ $prefix => $this->loadConfigFromAPI( [ $prefix =>
$wiki ], [ 'load-cont-lang' ], [ $this, 'siteConfSearchConfig' ] ) ];
}
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 535f35e..1ae527b 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -218,7 +218,7 @@
continue;
}
$lang = $detector->detect( $this, $term );
- if ( $lang === $this->config->get( 'wgLanguageCode' ) )
{
+ if ( $lang === $this->config->get( 'LanguageCode' ) ) {
// The query is in the wiki language so we
// don't need to actually try another wiki.
// Note that this may not be very accurate for
--
To view, visit https://gerrit.wikimedia.org/r/382605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib877f3c6f45aba9ddd6e04068bc935dab17ab6b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Tjones <tjo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
