From ff4e477633f16da5e587bc602b4f03be9f9826d1 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Sun, 29 Nov 2015 11:58:42 -0400
Subject: [PATCH] PM-4112

---
 .../engine/src/ProcessMaker/BusinessModel/EmailEvent.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
index d0adcea32..7abd47c3b 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
@@ -445,14 +445,7 @@ class EmailEvent
             }
             if(!empty($emailTo)) {
                 $subject = $arrayData[5];
-                if(substr($subject,0,1) == "@") {
-                    $subject = substr($subject, 2,strlen($subject));
-                    if(isset($arrayApplicationData['APP_DATA'])) {
-                        if(is_array($arrayApplicationData['APP_DATA']) && isset( $arrayApplicationData['APP_DATA'][$subject])) {
-                            $subject = $arrayApplicationData['APP_DATA'][$subject];
-                        }
-                    }
-                }
+                $subject = \G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']);
                 \PMFSendMessage($appUID, $arrayData[3], $emailTo, '', '', $subject, $contentFile['prf_filename'], array());
             }
         }