Merged in dheeyi/processmaker/HOR-1985 (pull request #5201)

HOR-1985
2016-11-30 21:50:45 +00:00
parent ed5d7a933d d2c3e1660d
commit 3b99259e4a
1 changed files with 2 additions and 1 deletions
--- a/workflow/engine/src/ProcessMaker/Project/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php
@@ -391,7 +391,8 @@ class Workflow extends Handler

            $route = \Route::findOneBy([
                \RoutePeer::TAS_UID => $fromTasUid,
-                \RoutePeer::ROU_NEXT_TASK => $toTasUid
+                \RoutePeer::ROU_NEXT_TASK => $toTasUid,
+                \RoutePeer::ROU_CONDITION => $condition
            ]);

            if (is_null($route)) {