X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/4dce03c0d3747788bd716fcedb7564bfedce7598..refs/pull/3433/head:/app/Http/Request.php

diff --git a/app/Http/Request.php b/app/Http/Request.php
index 687bae9a6..4cbdf34ba 100644
--- a/app/Http/Request.php
+++ b/app/Http/Request.php
@@ -26,6 +26,7 @@ class Request extends LaravelRequest
     /**
      * Override the default request methods to get the base URL
      * to directly use the custom APP_URL, if set.
+     * The base URL never ends with a / but should start with one if not empty.
      *
      * @return string
      */
@@ -34,7 +35,9 @@ class Request extends LaravelRequest
         $appUrl = config('app.url', null);
 
         if ($appUrl) {
-            return rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
+            $parsedBaseUrl = rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
+
+            return empty($parsedBaseUrl) ? '' : ('/' . $parsedBaseUrl);
         }
 
         return parent::getBaseUrl();