Fixed bug: incorrect advanced search spelling query.

module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php

@@ -123,6 +123,14 @@ class QueryBuilder implements QueryBuilderInterface
      */
     public function build(AbstractQuery $query)
     {
+        $params = new ParamBag();
+
+        // Add spelling query if applicable -- note that we mus set this up before
+        // we process the main query in order to avoid unwanted extra syntax:
+        if ($this->createSpellingQuery) {
+            $params->set('spellcheck.q', $query->getAllTerms());
+        }
+
         if ($query instanceOf QueryGroup) {
             $query = $this->reduceQueryGroup($query);
         } else {
@@ -132,8 +140,6 @@ class QueryBuilder implements QueryBuilderInterface
         $string  = $query->getString() ?: '*:*';
         $handler = $this->getSearchHandler($query->getHandler());
 
-        $params  = new ParamBag();
-
         if ($this->containsAdvancedLuceneSyntax($string)) {
             if ($handler) {
                 $string = $this->createAdvancedInnerSearchString($string, $handler);
@@ -166,11 +172,6 @@ class QueryBuilder implements QueryBuilderInterface
         }
         $params->set('q', $string);
 
-        // Add spelling query if applicable:
-        if ($this->createSpellingQuery) {
-            $params->set('spellcheck.q', $query->getAllTerms());
-        }
-
         return $params;
     }