UnifiedSearchController: strip webroot from URL before finding a route

This should fix route matching in UnifiedSearchController on setups with Nextcloud in a subfolder (webroot). Fixes: #24144 Signed-off-by: Jonas Meurer <[email protected]>
nextcloud · Aug 6, 2021 · 1fa67dc · 1fa67dc
1 parent 30d8704
commit 1fa67dc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php
@@ -123,9 +123,16 @@ protected function getRouteInformation(string $url): array {
 
 		if ($url !== '') {
 			$urlParts = parse_url($url);
+			$urlPath = $urlParts['path'];
+
+			// Optionally strip webroot from URL
+			$webroot = \OC::$WEBROOT;
+			if ($webroot !== '' && substr($urlPath, 0, strlen($webroot)) === $webroot) {
+				$urlPath = substr($urlPath, strlen($webroot));
+			}
 
 			try {
-				$parameters = $this->router->findMatchingRoute($urlParts['path']);
+				$parameters = $this->router->findMatchingRoute($urlPath);
 
 				// contacts.PageController.index => contacts.Page.index
 				$route = $parameters['caller'];