From 992bb5a96961244151c00cf2f3cc25902979d119 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 16 Nov 2017 10:17:49 +1300
Subject: [PATCH] FIX Use ModuleLoader to resolve the path to cli-script.php in
 framework

---
 code/solr/reindex/handlers/SolrReindexImmediateHandler.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/solr/reindex/handlers/SolrReindexImmediateHandler.php b/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
index 06e1980e..b1eec28d 100644
--- a/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
+++ b/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
@@ -4,6 +4,7 @@
 
 use Psr\Log\LoggerInterface;
 use SilverStripe\Control\Director;
+use SilverStripe\Core\Manifest\ModuleLoader;
 use SilverStripe\FullTextSearch\Solr\Solr;
 use SilverStripe\FullTextSearch\Solr\SolrIndex;
 use SilverStripe\ORM\DB;
@@ -71,7 +72,8 @@ protected function processGroup(
         $indexClass = get_class($indexInstance);
         $indexClassEscaped = addslashes($indexClass);
         $class = addslashes($class);
-        $scriptPath = sprintf("%s%sframework%scli-script.php", BASE_PATH, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
+        $frameworkPath = ModuleLoader::getModule('silverstripe/framework')->getPath();
+        $scriptPath = sprintf("%s%scli-script.php", $frameworkPath, DIRECTORY_SEPARATOR);
         $scriptTask = "php {$scriptPath} dev/tasks/{$taskName}";
 
         $cmd = "{$scriptTask} index={$indexClassEscaped} class={$class} group={$group} groups={$groups} variantstate={$statevar}";