Merge branch '3.7' into 3

This commit is contained in:
Serge Latyntcev 2020-11-06 08:56:17 +13:00
commit 7f36d1f56d

View File

@ -8,11 +8,11 @@ SilverStripe\ORM\DataObject:
SilverStripe\CMS\Controllers\ContentController: SilverStripe\CMS\Controllers\ContentController:
extensions: extensions:
- SilverStripe\FullTextSearch\Solr\Control\ContentControllerExtension - SilverStripe\FullTextSearch\Solr\Control\ContentControllerExtension
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
SilverStripe\FullTextSearch\Search\Queries\SearchQuery: SilverStripe\FullTextSearch\Search\Queries\SearchQuery:
calls: calls:
- [ setHandler, [ %$SilverStripe\FullTextSearch\Search\Adapters\SolrSearchAdapter ]] - [ setHandler, [ '%$SilverStripe\FullTextSearch\Search\Adapters\SolrSearchAdapter' ]]
SilverStripe\Dev\Tasks\MigrateFileTask: SilverStripe\Dev\Tasks\MigrateFileTask:
extensions: extensions: