jenkins-bot has submitted this change and it was merged.
Change subject: Fix override allowing all fields in rescore
......................................................................
Fix override allowing all fields in rescore
It was referencing a non-existent variable. Now it isn't.
Change-Id: I4a32ddbf6e9ecacf9c90c566edbd15f05f493f31
---
M includes/Hooks.php
M includes/Searcher.php
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Hooks.php b/includes/Hooks.php
index d2e39c9..6023f69 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -131,7 +131,7 @@
if ( $useAllFields !== null ) {
if ( $useAllFields === 'yes' ) {
$wgCirrusSearchAllFields[ 'use' ] =
true;
- } elseif( $useAllFields = 'no' ) {
+ } elseif( $useAllFields === 'no' ) {
$wgCirrusSearchAllFields[ 'use' ] =
false;
}
}
@@ -139,7 +139,7 @@
if ( $useAllFieldsForRescore !== null ) {
if ( $useAllFieldsForRescore === 'yes' ) {
$wgCirrusSearchAllFieldsForRescore =
true;
- } elseif( $useAllFieldsForRescore = 'no' ) {
+ } elseif( $useAllFieldsForRescore === 'no' ) {
$wgCirrusSearchAllFieldsForRescore =
false;
}
}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 28414ee..f832627 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -323,7 +323,8 @@
$wgCirrusSearchStemmedWeight,
$wgCirrusSearchPhraseSlop,
$wgCirrusSearchBoostLinks,
- $wgCirrusSearchAllFields;
+ $wgCirrusSearchAllFields,
+ $wgCirrusSearchAllFieldsForRescore;
$profiler = new ProfileSection( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/159349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a32ddbf6e9ecacf9c90c566edbd15f05f493f31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
