[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.31.0-wmf.6]: Allow turning Cirrus usage off from query

2017-11-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387662 )

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 repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/repo/Wikibase.hooks.php
+++ b/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/387662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.31.0-wmf.6]: Allow turning Cirrus usage off from query

2017-10-31 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387662 )

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 repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/62/387662/1

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/repo/Wikibase.hooks.php
+++ b/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/387662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits