From d5de59d73a1d7c8e4911196e70e5882d927df9e1 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Mon, 18 Mar 2019 15:44:43 -0400
Subject: [PATCH 1/2] PMC-541-A

---
 workflow/engine/src/ProcessMaker/Core/System.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 16b21bc78..d846a9cc5 100644
--- 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://";
     }
 
     /**

From 5a8cf0c736d7b143f7d0c776108631d2e970b868 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Wed, 20 Mar 2019 17:03:09 -0400
Subject: [PATCH 2/2] PMC-425

---
 workflow/engine/classes/model/Groupwf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php
index 989c0fca2..d14583f10 100644
--- a/workflow/engine/classes/model/Groupwf.php
+++ b/workflow/engine/classes/model/Groupwf.php
@@ -98,13 +98,13 @@ class Groupwf extends BaseGroupwf
                 $this->setGrpTitle('Default Group Title');
             }
 
-            if (!empty($aData['GRP_STATUS'])) {
+            if (!empty($data['GRP_STATUS'])) {
                 $this->setGrpStatus($data['GRP_STATUS']);
             } else {
                 $this->setGrpStatus('ACTIVE');
             }
 
-            if (!empty($aData['GRP_LDAP_DN'])) {
+            if (!empty($data['GRP_LDAP_DN'])) {
                 $this->setGrpLdapDn($data['GRP_LDAP_DN']);
             } else {
                 $this->setGrpLdapDn('');