Merge remote-tracking branch 'upstream/3.1' into HOR-1087

Conflicts: workflow/engine/classes/class.derivation.php
2016-06-08 12:19:39 -04:00
parent a4c3a5cdc7 617b66f2b1
commit f86e659c88
13 changed files with 75 additions and 25 deletions
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -1344,14 +1344,15 @@ class Derivation
        $flag = false;

        //check if there is any paused thread
-        $existThareadPause = false;
+
+        $existThreadPaused = false;
        if (isset($arraySiblings['pause'])) {
            if (!empty($arraySiblings['pause'])) {
-                $existThareadPause = true;
+                $existThreadPaused = true;
            }
        }

-        if ($openThreads == 0 && !$existThareadPause) {
+        if ($openThreads == 0 && !$existThreadPaused) {
            //Close case
            $appFields["APP_STATUS"] = "COMPLETED";
            $appFields["APP_FINISH_DATE"] = "now";