jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387749 )
Change subject: Allow turning Cirrus usage off from query
......................................................................
Allow turning Cirrus usage off from query
Bug: T179428
Change-Id: I653384345315884dbf94a770f83aac2558d16b17
(cherry picked from commit 2c80695f9e7275915aef000d50270ebb9d28a931)
---
M extensions/Wikibase/repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php
b/extensions/Wikibase/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -113,8 +113,13 @@
$request = RequestContext::getMain()->getRequest();
$settings = $wikibaseRepo->getSettings();
$searchSettings = $settings->getSetting( 'entitySearch' );
- if ( $searchSettings['useCirrus'] === null && $request->getVal(
'useCirrus' ) ) {
- $searchSettings['useCirrus'] = true;
+ $useCirrus = $request->getVal( 'useCirrus' );
+ if ( $useCirrus !== null ) {
+ // if we have request one, use it
+ $searchSettings['useCirrus'] =
+ // This really should be global utility function
+ ( $useCirrus === 'on' || $useCirrus === 'true'
|| $useCirrus === 'yes' ||
+ $useCirrus === '1' );
$settings->setSetting( 'entitySearch', $searchSettings
);
}
if ( $searchSettings['useCirrus'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/387749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
