Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2631

2017-02-07 12:30:27 -04:00
parent a1de462bae db66e03953
commit 7917fd911b
7 changed files with 132 additions and 13 deletions
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -65,6 +65,9 @@ class RoutingScreen extends \Derivation
                    } else {
                        $aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
                    }
+                    if (isset($post[$i]['NEXT_TASK'])) {
+                        $aDataMerged[$key]['NEXT_TASK'] = $post[$i]['NEXT_TASK'];
+                    }
                }
            }
        }