tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9916 from chrometoasters/bugfix/absolute-base-url-generation 

[BUGFIX] Prevent call getHeader() on null HTTPRequest object
This commit is contained in:
Loz Calver 2021-04-16 09:15:15 +01:00 committed by GitHub
parent 0e4527824c 31c5ab2069
commit 097da7aed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Control/Director.php
View File

@ -938,12 +938,13 @@ class Director implements TemplateGlobalProvider
public static function absoluteBaseURLWithAuth(HTTPRequest $request = null)
{
// Detect basic auth
$user = $request->getHeader('PHP_AUTH_USER');
if ($user) {
$password = $request->getHeader('PHP_AUTH_PW');
$login = sprintf("%s:%s@", $user, $password) ;
} else {
$login = '';
$login = '';
if ($request) {
$user = $request->getHeader('PHP_AUTH_USER');
if ($user) {
$password = $request->getHeader('PHP_AUTH_PW');
$login = sprintf("%s:%s@", $user, $password);
}
}
return Director::protocol($request) . $login . static::host($request) . Director::baseURL();