webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Fixed redirect issue when custom app url in use

Browse Source 
Fixes #956 & #1048
Also added tests to cover this url logic.
Also removed debugbar during tests to maybe improve test speed.
This commit is contained in:
Dan Brown
2018-11-04 15:18:27 +00:00
parent 7799ba5c79
commit 19b7093438
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers.php
View File

@ -92,10 +92,15 @@ function baseUrl($path, $forceAppDomain = false)
if ($isFullUrl && !$forceAppDomain) {
return $path;
}
$path = trim($path, '/');
$trimBase = rtrim(config('app.url'), '/');
// Remove non-specified domain if forced and we have a domain
if ($isFullUrl && $forceAppDomain) {
if (strpos($path, $trimBase) === 0) {
$path = trim(substr($path, strlen($trimBase) - 1));
}
$explodedPath = explode('/', $path);
$path = implode('/', array_splice($explodedPath, 3));
}
@ -105,7 +110,7 @@ function baseUrl($path, $forceAppDomain = false)
return url($path);
}
return rtrim(config('app.url'), '/') . '/' . $path;
return $trimBase . '/' . $path;
}
/**