Merge branch '3.3'

src/Search/Variants/SearchVariant.php

@@ -6,6 +6,7 @@ use ReflectionClass;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex;
+use SilverStripe\FullTextSearch\Search\Queries\SearchQuery;
 use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator;
 
 /**

src/Search/Variants/SearchVariantVersioned.php

@@ -53,7 +53,7 @@ class SearchVariantVersioned extends SearchVariant
 
     public function alterQuery($query, $index)
     {
-        $query->filter('_versionedstage', [
+        $query->addFilter('_versionedstage', [
             $this->currentState(),
             SearchQuery::$missing
         ]);

src/Solr/Forms/SearchForm.php

@@ -65,6 +65,10 @@ class SearchForm extends Form
         $searchTerms = $request->requestVar('Search');
         $query = SearchQuery::create()->addSearchTerm($searchTerms);
 
+        if ($start = $request->requestVar('start')) {
+            $query->setStart($start);
+        }
+
         $params = [
             'spellcheck' => 'true',
             'spellcheck.collate' => 'true',