Merge branch '3.9' into 3

composer.json

@@ -24,7 +24,6 @@
         "php": "^7.4 || ^8.0",
         "silverstripe/framework": "^4.10",
         "monolog/monolog": "~1.15",
-        "ptcinc/solr-php-client": "^1.0",
         "symfony/process": "^3.4 || ^4",
         "tractorcow/silverstripe-proxy-db": "~0.1",
         "ext-curl": "*"
@@ -38,7 +37,10 @@
         "psr-4": {
             "SilverStripe\\FullTextSearch\\": "src/",
             "SilverStripe\\FullTextSearch\\Tests\\": "tests/"
-        }
+        },
+        "classmap": [
+            "thirdparty/solr-php-client"
+        ]
     },
     "bin": [
         "bin/fulltextsearch_quickstart"

src/Search/Processors/SearchUpdateProcessor.php

@@ -5,6 +5,7 @@
 use SilverStripe\FullTextSearch\Search\Services\SearchableService;
 use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\DB;
 use SilverStripe\FullTextSearch\Search\Variants\SearchVariant;
 use SilverStripe\FullTextSearch\Search\FullTextSearch;
 use SilverStripe\Versioned\Versioned;
@@ -154,6 +155,9 @@ protected function getSource()
      */
     public function process()
     {
+        if (!DB::is_active()) {
+            return false;
+        }
         // Generate and commit all instances
         $indexes = $this->prepareIndexes();
         foreach ($indexes as $index) {