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

diff --git a/app/Http/Request.php b/app/Http/Request.php
index 183686f67..4cbdf34ba 100644
--- a/app/Http/Request.php
+++ b/app/Http/Request.php
@@ -1,25 +1,45 @@
-<?php namespace BookStack\Http;
+<?php
+
+namespace BookStack\Http;
 
 use Illuminate\Http\Request as LaravelRequest;
 
 class Request extends LaravelRequest
 {
-
     /**
      * Override the default request methods to get the scheme and host
-     * to set the custom APP_URL, if set.
-     * @return \Illuminate\Config\Repository|mixed|string
+     * to directly use the custom APP_URL, if set.
+     *
+     * @return string
      */
     public function getSchemeAndHttpHost()
     {
-        $base = config('app.url', null);
+        $appUrl = config('app.url', null);
+
+        if ($appUrl) {
+            return implode('/', array_slice(explode('/', $appUrl), 0, 3));
+        }
+
+        return parent::getSchemeAndHttpHost();
+    }
+
+    /**
+     * 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
+     */
+    public function getBaseUrl()
+    {
+        $appUrl = config('app.url', null);
+
+        if ($appUrl) {
+            $parsedBaseUrl = rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
 
-        if ($base) {
-            $base = trim($base, '/');
-        } else {
-            $base = $this->getScheme().'://'.$this->getHttpHost();
+            return empty($parsedBaseUrl) ? '' : ('/' . $parsedBaseUrl);
         }
 
-        return $base;
+        return parent::getBaseUrl();
     }
 }