Merged in bugfix/PMC-541-A (pull request #6810)

PMC-541-A

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Roly
2019-03-19 20:25:50 +00:00
committed by Julio Cesar Laura Avendaño

View File

@@ -1534,7 +1534,8 @@ class System
*/
public static function getServerProtocol()
{
return G::is_https() ? "https://" : "http://";
$envProtocol = defined("REQUEST_SCHEME") && REQUEST_SCHEME === "https";
return G::is_https() || $envProtocol ? "https://" : "http://";
}
/**