From c77c2a8a06f689f97b8cd736f279847ac92ea5a7 Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Fri, 12 Jul 2019 22:56:03 +0200 Subject: [PATCH] MDL-66140 search: Mitigate PECL solr extension regression Refs: - https://bugs.php.net/bug.php?id=72740 - https://bugs.php.net/bug.php?id=75631 - https://github.com/php/pecl-search_engine-solr/pull/16 --- search/engine/solr/classes/engine.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php index f908d50ed79..aff8055f397 100644 --- a/search/engine/solr/classes/engine.php +++ b/search/engine/solr/classes/engine.php @@ -433,7 +433,10 @@ class engine extends \core_search\engine { $query->addField($key); if ($dismax && !empty($field['mainquery'])) { // Add fields the main query should be run against. - $query->addQueryField($key); + // Due to a regression in the PECL solr extension, https://bugs.php.net/bug.php?id=72740, + // a boost value is required, even if it is optional; to avoid boosting one among other fields, + // the explicit boost value will be the default one, for every field. + $query->addQueryField($key, 1); } } }