From da79ea5424c20423b23969f47bdaecdfd3e1ce98 Mon Sep 17 00:00:00 2001 From: Ronald Q Date: Thu, 21 Jul 2016 16:18:21 -0400 Subject: [PATCH] HOR-1355 HOR-1355 bug --- workflow/engine/classes/class.processes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index c7af1178d..22d180ad3 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -4772,7 +4772,7 @@ class Processes if (is_array($sGroupList)) { foreach ($aGroupwf as $groupBase) { foreach ($sGroupList as $group) { - if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) { + if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['GRP_UID'] != $group['GRP_UID']) { $oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] ); if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') { $group['GRP_UID'] = G::generateUniqueID(); @@ -4848,8 +4848,8 @@ class Processes foreach ($sGroupList as $group) { $merged = false; foreach ($aGroupwf as $groupBase) { - if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) { - $group['GRP_UID'] = $groupBase['CON_ID']; + if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['GRP_UID'] != $group['GRP_UID']) { + $group['GRP_UID'] = $groupBase['GRP_UID']; $mergedGroupList[] = $group; $merged = true; }