fix internal route when using occ

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · May 9, 2023 · c4bf33b · c4bf33b
1 parent c24a299
commit c4bf33b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -741,6 +741,12 @@ public function linkToRoute(string $route, array $args): string {
 		$path = $this->urlGenerator->linkToRoute($route, $args);
 
 		if (OC::$CLI) {
+			// when running from the occ command, /index.php is not removed by itself
+			if (str_starts_with($path, '/index.php/')
+				&& $this->config->getSystemValueString('htaccess.RewriteBase', '') !== '') {
+				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/') . substr($path, 11);
+			}
+
 			$knownPath = parse_url($this->config->getSystemValue('overwrite.cli.url'), PHP_URL_PATH);
 		} else {
 			$knownPath = OC::$WEBROOT;