Merge branch '2'

This commit is contained in:
Robbie Averill 2017-12-13 18:07:54 +13:00
commit 415a1b9960
2 changed files with 8 additions and 0 deletions

View File

@ -17,6 +17,8 @@ class Solr_Configure extends Solr_BuildTask
{
parent::run($request);
$this->extend('updateBeforeSolrConfigureTask', $request);
// Find the IndexStore handler, which will handle uploading config files to Solr
$store = $this->getSolrConfigStore();
@ -35,6 +37,8 @@ class Solr_Configure extends Solr_BuildTask
if (isset($e)) {
exit(1);
}
$this->extend('updateAfterSolrConfigureTask', $request);
}
/**

View File

@ -56,10 +56,14 @@ class Solr_Reindex extends Solr_BuildTask
{
parent::run($request);
$this->extend('updateBeforeSolrReindexTask', $request);
// Reset state
$originalState = SearchVariant::current_state();
$this->doReindex($request);
SearchVariant::activate_state($originalState);
$this->extend('updateAfterSolrReindexTask', $request);
}
/**