Provide a fallback value for $request_url_root if $_SERVER['HTTP_HOST'] *and* $_SERVER['SERVER_NAME'] are undefined (eliminates error in unit testing)

10 years ago · ac98223e6e
parent 9d9d159479
commit ac98223e6e
1 changed files with 9 additions and 3 deletions
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@ -228,9 +228,15 @@ if (!empty($_configuration['multiple_access_urls'])) {
    $root_rel = substr($root_rel,0,$pos);
    $protocol = ((!empty($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) != 'OFF') ? 'https' : 'http').'://';
    //urls with subdomains (HTTP_HOST is preferred - see #6764)
-    $request_url_root = $protocol.$_SERVER['HTTP_HOST'].'/';
-    if (empty($request_url_root)) {
-        $request_url_root = $protocol.$_SERVER['SERVER_NAME'].'/';
+    $request_url_root = '';
+    if (empty($_SERVER['HTTP_HOST'])) {
+        if (empty($_SERVER['SERVER_NAME'])) {
+            $request_url_root = $protocol . 'localhost/';
+        } else {
+            $request_url_root = $protocol . $_SERVER['SERVER_NAME'] . '/';
+        }
+    } else {
+        $request_url_root = $protocol.$_SERVER['HTTP_HOST'].'/';
    }
    //urls with subdirs
    $request_url_sub = $request_url_root.$root_rel.'/';