From 0dbc337b26b08a553d4feb562a43845bcc1f865e Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Fri, 3 Mar 2017 15:11:04 -0400
Subject: [PATCH] Deletion of MAIL and MESSAGE end events from the list of task
 types that will jump the dummy task

---
 workflow/engine/classes/class.derivation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 5acc06749..b3fe7c37a 100644
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -59,7 +59,7 @@ class Derivation
     public function __construct()
     {
         $this->userLogged = new Users();
-        $this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT");
+        $this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY");
     }
 
     /**
@@ -269,7 +269,7 @@ class Derivation
                 $arrayNextTaskData = $value;
                 $this->node[$value['TAS_UID']]['out'][$value['ROU_NEXT_TASK']] = $value['ROU_TYPE'];
                 if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] != "-1" &&
-                    preg_match("/^(?:GATEWAYTOGATEWAY)$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"])
+                    preg_match("/^(?:" . $this->regexpTaskTypeToInclude . ")$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"])
                 ) {
                     $arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]);
                     $this->node[$value['ROU_NEXT_TASK']]['in'][$value['TAS_UID']] = $value['ROU_TYPE'];