webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

Fixed faulty baseUrl rewrites

Browse Source 
Fixes #1452
May help #1377
This commit is contained in:
Dan Brown
2019-05-19 16:25:05 +01:00
parent 5470a9e035
commit 8ae35f645a
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers.php
View File

@@ -123,10 +123,11 @@ function baseUrl($path, $forceAppDomain = false)
// Remove non-specified domain if forced and we have a domain
if ($isFullUrl && $forceAppDomain) {
if (!empty($base) && strpos($path, $base) === 0) {
$path = trim(substr($path, strlen($base) - 1));
$path = substr($path, strlen($base));
} else {
$explodedPath = explode('/', $path);
$path = implode('/', array_splice($explodedPath, 3));
}
$explodedPath = explode('/', $path);
$path = implode('/', array_splice($explodedPath, 3));
}
// Return normal url path if not specified in config
@@ -134,7 +135,7 @@ function baseUrl($path, $forceAppDomain = false)
return url($path);
}
return $base . '/' . $path;
return $base . '/' . ltrim($path, '/');
}
/**