Merged in develop (pull request #6814)

PMC-541 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-03-19 20:28:29 +00:00
parent bc39876669 2dfd489964
commit a68b707ecd
1 changed files with 2 additions and 1 deletions
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -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://";
    }

    /**