From b90a78796de0e50918d8a914d1b641bc68010144 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Thu, 8 Mar 2018 23:02:54 +0530
Subject: [PATCH] Fixes #903: Balanced reverting user context

---
 modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc | 4 +++-
 modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
index a096a87e4..1e2c7f657 100644
--- a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
+++ b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
@@ -32,6 +32,7 @@ class VTCreateEntityTask extends VTTask {
 
 		$entityType = $this->entity_type;		
 		if(!vtlib_isModuleActive($entityType)) {
+			$util->revertUser();
 			return;
 		}
 
@@ -198,6 +199,7 @@ class VTCreateEntityTask extends VTTask {
 			} catch (Exception $e) {
 			}
 			$util->revertUser();
+			return;
 		}
 
 		$util->revertUser();
@@ -225,4 +227,4 @@ class VTCreateEntityTask extends VTTask {
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc b/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc
index 826894a5a..35b748393 100644
--- a/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc
+++ b/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc
@@ -345,7 +345,6 @@ class VTUpdateFieldsTask extends VTTask {
 
 			// Reverting back the action name as there can be some dependencies on this.
 			$_REQUEST['action'] = $actionName;
-			$util->revertUser();
 		}
 		$util->revertUser();
 		$_FILES = $tmpFiles;
@@ -419,4 +418,4 @@ class VTUpdateFieldsTask extends VTTask {
 
 }
 
-?>
\ No newline at end of file
+?>
-- 
GitLab