Merge pull request #2308 from MGatner/autoroute-slashes

Bugfix extra autoroute slashes
codeigniter4 · Oct 8, 2019 · c2407a1 · c2407a1
2 parents 5295d37 + 3fef955
commit c2407a1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -578,10 +578,9 @@ protected function validateRequest(array $segments): array
 
 		// Loop through our segments and return as soon as a controller
 		// is found or when such a directory doesn't exist
-		while ($c -- > 0)
+		while ($c-- > 0)
 		{
-			$test = $this->directory . ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]
-			);
+			$test = $this->directory . ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
 
 			if (! is_file(APPPATH . 'Controllers/' . $test . '.php') && $directory_override === false && is_dir(APPPATH . 'Controllers/' . $this->directory . ucfirst($segments[0])))
 			{
@@ -606,6 +605,11 @@ protected function validateRequest(array $segments): array
 	 */
 	protected function setDirectory(string $dir = null, bool $append = false)
 	{
+		if (empty($dir))
+		{
+			return;
+		}
+
 		$dir = ucfirst($dir);
 
 		if ($append !== true || empty($this->directory))