Applies DefaultRoute when a route is specified but doesn't match a valid route

TRPB · TRPB · commit c2cc6d221527 · 2017-04-26T10:09:17.000+01:00
diff --git a/ModuleJson.php b/ModuleJson.php
@@ -21,7 +21,7 @@ public function find(array $route) {
 		$method = $this->request->server('REQUEST_METHOD');
 
 
-		if (!isset($route[0]) || (isset($route[0]) && $route[0] == '')) $routeName = isset($config->$method->defaultRoute) ? $config->$method->defaultRoute : 'index';
+		if (empty($route[0]) || !isset($config->$method->{$route[0]})) $routeName = isset($config->$method->defaultRoute) ? $config->$method->defaultRoute : 'index';
 		else $routeName = array_shift($route);
 
 		if (isset($config->$method->$routeName)) {
@@ -33,8 +33,10 @@ public function find(array $route) {
 				$matchedRoute = (object) array_merge((array)$matchedRoute, (array)$config->$inheritMethod->$routeName);
 			}
 
-			return $this->getRoute($matchedRoute, $route);
 		}
+
+		return $this->getRoute($matchedRoute, $route);
+
 	}
 
 	private function getRouteDir($moduleName) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function find(array $route) {`
`21`	`21`	`$method = $this->request->server('REQUEST_METHOD');`
`22`	`22`
`23`	`23`
`24`		`- if (!isset($route[0]) \|\| (isset($route[0]) && $route[0] == '')) $routeName = isset($config->$method->defaultRoute) ? $config->$method->defaultRoute : 'index';`
	`24`	`+ if (empty($route[0]) \|\| !isset($config->$method->{$route[0]})) $routeName = isset($config->$method->defaultRoute) ? $config->$method->defaultRoute : 'index';`
`25`	`25`	`else $routeName = array_shift($route);`
`26`	`26`
`27`	`27`	`if (isset($config->$method->$routeName)) {`
`@@ -33,8 +33,10 @@ public function find(array $route) {`
`33`	`33`	`$matchedRoute = (object) array_merge((array)$matchedRoute, (array)$config->$inheritMethod->$routeName);`
`34`	`34`	`}`
`35`	`35`
`36`		`- return $this->getRoute($matchedRoute, $route);`
`37`	`36`	`}`
	`37`	`+`
	`38`	`+ return $this->getRoute($matchedRoute, $route);`
	`39`	`+`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`private function getRouteDir($moduleName) {`