tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.7' into 4

Browse Source
This commit is contained in:
Steve Boyd 2021-04-19 16:39:15 +12:00
commit 3d7868449f
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) public static function absoluteBaseURLWithAuth(HTTPRequest $request = null)
{ {
// Detect basic auth // Detect basic auth
$user = $request->getHeader('PHP_AUTH_USER'); $login = '';
if ($user) { if ($request) {
$password = $request->getHeader('PHP_AUTH_PW'); $user = $request->getHeader('PHP_AUTH_USER');
$login = sprintf("%s:%s@", $user, $password) ; if ($user) {
} else { $password = $request->getHeader('PHP_AUTH_PW');
$login = ''; $login = sprintf("%s:%s@", $user, $password);
}
} }
return Director::protocol($request) . $login . static::host($request) . Director::baseURL(); return Director::protocol($request) . $login . static::host($request) . Director::baseURL();