1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00

Replaced use of custom 'baseUrl' helper with 'url'

Also changed up how base URL setting was being done
by manipulating incoming request URLs instead of
altering then on generation.
This commit is contained in:
Dan Brown
2019-08-04 14:26:39 +01:00
parent 30da105812
commit 4b0c4e621a
67 changed files with 222 additions and 306 deletions

26
app/Http/Request.php Normal file
View File

@ -0,0 +1,26 @@
<?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
*/
public function getSchemeAndHttpHost()
{
$base = config('app.url', null);
if ($base) {
$base = trim($base, '/');
} else {
$base = $this->getScheme().'://'.$this->getHttpHost();
}
return $base;
}
}