Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed baseURL helper when no app url is set

Browse Source 
Also cleaned variable naming to be more obvious
This commit is contained in:
Dan Brown 2018-11-09 21:29:30 +00:00
parent e3230f8f21
commit 038b2418f7
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers.php
View File

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