Merged in paulis/processmaker/PM-1558 (pull request #1504)

I solved the conflict in the issue PM-1558
2015-02-20 15:23:07 -04:00
parent b2aad3ae52 2ed9cc983c
commit b8915ad4d8
1 changed files with 2 additions and 1 deletions
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -182,7 +182,8 @@ class Derivation

                if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
                    $arrayNextTaskDefault = $arrayRouteData;
-                    continue;
+                    $arrayNextTask = array();
+                    break;
                }

                $flagContinue = true;