[BUGFIX] Prevent call getHeader() on null HTTPRequest object

silverstripe · Apr 13, 2021 · 31c5ab2 · 31c5ab2
1 parent 77c85da
commit 31c5ab2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Control/Director.php b/src/Control/Director.php
@@ -938,12 +938,13 @@ public static function absoluteBaseURL()
     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();