Merge branch 'm36_MDL-66140_Mitigate_PECL_Solr_issue_Ref_72740' of https://github.com/scara/moodle into MOODLE_36_STABLE

2019-08-15 11:17:50 +08:00
parent 7adb08d1ad c77c2a8a06
commit 6e3a15df95
1 changed files with 4 additions and 1 deletions
@@ -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);
            }
        }
    }