fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in develop (pull request #6818)

Browse Source 
Updating branch with last changes in develop
This commit is contained in:
Julio Cesar Laura Avendaño
2019-03-21 13:28:38 +00:00
parent f9f65002fd 5ca2bd2cce
commit 6feb542ca2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/Groupwf.php
View File

@@ -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('');

3
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1501,7 +1501,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://";
}
/**