jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342907 )
Change subject: Keep variable around that was removed in wmf.16
......................................................................
Keep variable around that was removed in wmf.16
This variable was removed in wmf.16, but wmf.15 wikis can still ask for
it from wmf.16 wikis when interwiki search based on language detection
decides we should ask for more results from a wmf.15 wiki.
Default it to empty to prevent errors from occuring.
Bug: T160569
Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
---
M wmf-config/CirrusSearch-common.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
20after4: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index c242703..05dd056 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -251,6 +251,12 @@
'merge.scheduler.max_thread_count' => 1,
];
+// Temp hax for variable that was removed, due to interwiki search based on
+// lang detection asking for this variable from wmf.15 to wmf.16 wikis.
+if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
+ $wgCirrusSearchCompletionGeoContextSettings = [];
+}
+
# Load per realm specific configuration, either:
# - CirrusSearch-labs.php
# - CirrusSearch-production.php
--
To view, visit https://gerrit.wikimedia.org/r/342907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
