Merged in develop (pull request #6814)
PMC-541 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
@@ -1534,7 +1534,8 @@ class System
|
|||||||
*/
|
*/
|
||||||
public static function getServerProtocol()
|
public static function getServerProtocol()
|
||||||
{
|
{
|
||||||
return G::is_https() ? "https://" : "http://";
|
$envProtocol = defined("REQUEST_SCHEME") && REQUEST_SCHEME === "https";
|
||||||
|
return G::is_https() || $envProtocol ? "https://" : "http://";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user