EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286457
Change subject: Merge remote-tracking branch 'origin/master' into es2.x
......................................................................
Merge remote-tracking branch 'origin/master' into es2.x
Merge master into es2.x to make sure we don't diverge and the final
merge back is simple and easy.
Change-Id: Ia36951689d8dc30132e8123fc8b7abd32f243b92
---
M autoload.php
M includes/Search/RescoreBuilders.php
2 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/57/286457/1
diff --git a/autoload.php b/autoload.php
index e37553d..c95127a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -33,14 +33,9 @@
'CirrusSearch\\Elastica\\PooledHttp' => __DIR__ .
'/includes/Elastica/PooledHttp.php',
'CirrusSearch\\Elastica\\PooledHttps' => __DIR__ .
'/includes/Elastica/PooledHttps.php',
'CirrusSearch\\ElasticsearchIntermediary' => __DIR__ .
'/includes/ElasticsearchIntermediary.php',
-<<<<<<< HEAD (1263fc Merge "Minor optimization of generated query" into
es2.x)
+ 'CirrusSearch\\ExplainPrinter' => __DIR__ .
'/includes/ExplainPrinter.php',
'CirrusSearch\\Extra\\Query\\IdHashMod' => __DIR__ .
'/includes/Extra/Query/IdHashMod.php',
'CirrusSearch\\Extra\\Query\\SourceRegex' => __DIR__ .
'/includes/Extra/Query/SourceRegex.php',
-=======
- 'CirrusSearch\\ExplainPrinter' => __DIR__ .
'/includes/ExplainPrinter.php',
- 'CirrusSearch\\Extra\\Filter\\IdHashMod' => __DIR__ .
'/includes/Extra/Filter/IdHashMod.php',
- 'CirrusSearch\\Extra\\Filter\\SourceRegex' => __DIR__ .
'/includes/Extra/Filter/SourceRegex.php',
->>>>>>> BRANCH (48fd3c Localisation updates from https://translatewiki.net.)
'CirrusSearch\\ForceSearchIndex' => __DIR__ .
'/maintenance/forceSearchIndex.php',
'CirrusSearch\\Hooks' => __DIR__ . '/includes/Hooks.php',
'CirrusSearch\\InterwikiSearcher' => __DIR__ .
'/includes/InterwikiSearcher.php',
diff --git a/includes/Search/RescoreBuilders.php
b/includes/Search/RescoreBuilders.php
index ff08921..0405629 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -678,13 +678,9 @@
if( $this->impact == 0 ) {
return;
}
-<<<<<<< HEAD (1263fc Merge "Minor optimization of generated query" into
es2.x)
- $functionScore->addScriptScoreFunction( new
\Elastica\Script\Script( $formula, null, 'expression' ), null, $this->weight );
-=======
$formula = $this->getScript();
- $functionScore->addScriptScoreFunction( new \Elastica\Script(
$formula, null, 'expression' ), null, $this->weight );
->>>>>>> BRANCH (48fd3c Localisation updates from https://translatewiki.net.)
+ $functionScore->addScriptScoreFunction( new
\Elastica\Script\Script( $formula, null, 'expression' ), null, $this->weight );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/286457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia36951689d8dc30132e8123fc8b7abd32f243b92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es2.x
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
