From 2a77c913b4f194f19ae905297d0a53cc056bbf4f Mon Sep 17 00:00:00 2001 From: Ronald Q Date: Fri, 12 Aug 2016 15:30:38 -0400 Subject: [PATCH] fix in task to task --- .../engine/src/ProcessMaker/Core/RoutingScreen.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php index fb9117456..8aa1d93ca 100644 --- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php +++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php @@ -80,12 +80,9 @@ class RoutingScreen extends \Derivation } return array_combine(range(1, count($response)), array_values($response)); } - + public function checkElement($element) { - if (empty($element['in'])) { - return true; - } $outElement = $element['out']; foreach ($outElement as $indexO => $outE) { if (!$this->isFirst && in_array($outE, $this->gateway)) { @@ -95,11 +92,14 @@ class RoutingScreen extends \Derivation $this->taskSecJoin[$indexO] = $outE; } } + if (empty($element['in'])) { + return true; + } $this->isFirst = false; $inElement = $element['in']; foreach ($inElement as $indexI => $inE) { - if ($inE == 'SEC-JOIN') { - $this->convergent[$indexI]=$inE; + if ($inE == 'SEC-JOIN' && strpos($indexI, 'itee') !== false) { + $this->convergent[$indexI] = $inE; } $this->checkElement($this->node[$indexI]); }