Fix hard coded front controller directory for Craft

Martin Leveille · Martin Leveille · commit 2227945543dc · 2017-09-17T09:20:48.000-04:00
diff --git a/cli/drivers/CraftValetDriver.php b/cli/drivers/CraftValetDriver.php
@@ -183,8 +183,8 @@ public function frontControllerPath($sitePath, $siteName, $uri)
         $parts = explode('/', $uri);
 
         if (count($parts) > 1 && in_array($parts[1], $locales)) {
-            $indexPath = $sitePath.'/public/'. $parts[1] .'/index.php';
-            $scriptName = '/' . $parts[1] . '/index.php';
+            $indexPath = $sitePath.'/'.$frontControllerDirectory.'/'.$parts[1].'/index.php';
+            $scriptName = '/'.$parts[1].'/index.php';
         }
 
         $_SERVER['SCRIPT_FILENAME'] = $indexPath;

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ public function frontControllerPath($sitePath, $siteName, $uri)`
`183`	`183`	`$parts = explode('/', $uri);`
`184`	`184`
`185`	`185`	`if (count($parts) > 1 && in_array($parts[1], $locales)) {`
`186`		`- $indexPath = $sitePath.'/public/'. $parts[1] .'/index.php';`
`187`		`- $scriptName = '/' . $parts[1] . '/index.php';`
	`186`	`+ $indexPath = $sitePath.'/'.$frontControllerDirectory.'/'.$parts[1].'/index.php';`
	`187`	`+ $scriptName = '/'.$parts[1].'/index.php';`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`$_SERVER['SCRIPT_FILENAME'] = $indexPath;`