composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.7' into develop

Browse Source
This commit is contained in:
odain
2021-03-15 16:06:20 +01:00
parent a15cc8718e 386c90c601
commit eacdfa4088
6 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/utils.inc.php
View File

@@ -861,7 +861,7 @@ class utils
}
/**
* @return bool The boolean value of the conf. "trust_proxies" (except if there is no REMOTE_ADDR int his case, it return false)
* @return bool The boolean value of the conf. "behind_reverse_proxy" (except if there is no REMOTE_ADDR int his case, it return false)
*
* @since 2.7.4
*/
@@ -871,7 +871,7 @@ class utils
return false;
}
$bTrustProxies = (bool) self::GetConfig()->Get('trust_proxies');
$bTrustProxies = (bool) self::GetConfig()->Get('behind_reverse_proxy');
return $bTrustProxies;
}
@@ -890,7 +890,7 @@ class utils
public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
{
static $sUrl = null;
if ($sUrl === null)
if ($sUrl === null || $bForceTrustProxy)
{
$sUrl = self::GetConfig()->Get('app_root_url');
if ($sUrl == '')