Helpers: Fix routing to full domain

baraja-core · Jan 5, 2020 · 1c64f00 · 1c64f00
1 parent 7e7ab64
commit 1c64f00
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -30,12 +30,12 @@ public static function processPath(): string
 		if (($currentUrl = self::getCurrentUrl()) !== null) {
 			if (preg_match('/^(?:https?:\/\/.+)\/www\/?(.*)$/', $currentUrl, $localUrlParser)) {
 				$return = $localUrlParser[1];
-			} elseif (preg_match('/^(?:https?:\/\/[^\/]+)(.*)$/', $currentUrl, $publicUrlParser)) {
-				$return = $publicUrlParser[2];
+			} elseif (preg_match('/^(?:https?:\/\/[^\/]+)(.*?)$/', $currentUrl, $publicUrlParser)) {
+				$return = $publicUrlParser[1];
 			}
 		}
 
-		return $return !== null ? rtrim($return, '/') : '';
+		return $return !== null ? trim($return, '/') : '';
 	}
 
 	/**