From 22e712c2c62a62e230020c16496043d2eb99c6ce Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Wed, 5 Sep 2018 15:06:07 -0400
Subject: [PATCH] HOR-4862

---
 workflow/engine/classes/class.pmFunctions.php | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index a2a3a4429..0f06b5c6e 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -2767,27 +2767,26 @@ function PMFDeleteCase ($caseUid)
  * @return int | $result | Result of the cancelation | Returns 1 if the case is cancel successfully; otherwise, returns 0 if an error occurred.
  *
  */
-function PMFCancelCase ($caseUid, $delIndex = null, $userUid = null)
+function PMFCancelCase($caseUid, $delIndex = null, $userUid = null)
 {
     $ws = new WsBase();
     $result = $ws->cancelCase($caseUid, $delIndex, $userUid);
     $result = (object)$result;
-
+    $sessionAppUid = $_SESSION['APPLICATION'];
     if ($result->status_code == 0) {
-        if (isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])) {
-            if ($_SESSION['APPLICATION'] == $caseUid && $_SESSION['INDEX'] == $delIndex) {
-                if (!defined('WEB_SERVICE_VERSION')) {
-                    G::header('Location: ../cases/casesListExtJsRedirector');
-                    die();
-                } else {
-                    die(
-                        G::LoadTranslation(
+        //It was cancelled the same case in the execution
+        if ($sessionAppUid === $caseUid) {
+            if (!defined('WEB_SERVICE_VERSION')) {
+                G::header('Location: ../cases/casesListExtJsRedirector');
+                die;
+            } else {
+                die(
+                    G::LoadTranslation(
                         'ID_PM_FUNCTION_CHANGE_CASE',
                         SYS_LANG,
-                            ['PMFCancelCase', G::LoadTranslation('ID_CANCELLED')]
-                        )
-                    );
-                }
+                        ['PMFCancelCase', G::LoadTranslation('ID_CANCELLED')]
+                    )
+                );
             }
         }