X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/03073dd9e413d20d385cb4a90cbce420fa5614c1..refs/pull/1462/head:/app/helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 3f7b5e1b1..0fedf2e8d 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -52,7 +52,8 @@ function signedInUser() : bool
  * Check if the current user has general access.
  * @return bool
  */
-function hasAppAccess() : bool {
+function hasAppAccess() : bool
+{
     return !auth()->guest() || setting('app-public');
 }
 
@@ -122,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
@@ -133,7 +135,7 @@ function baseUrl($path, $forceAppDomain = false)
         return url($path);
     }
 
-    return $base . '/' . $path;
+    return $base . '/' . ltrim($path, '/');
 }
 
 /**