Merge pull request #4609 from laboro/fix/CRM-3513_1.7

CRM-3513 1.7: Email are shown with all html tags
oroinc · Jun 16, 2015 · 597bf02 · 597bf02
2 parents 3ab2138 + 8e96913
commit 597bf02
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Oro/Bundle/EmailBundle/Workflow/Action/SendEmail.php b/src/Oro/Bundle/EmailBundle/Workflow/Action/SendEmail.php
@@ -72,6 +72,7 @@ public function initialize(array $options)
      */
     protected function executeAction($context)
     {
+        $type = 'txt';
         $emailModel = new Email();
         $emailModel->setFrom($this->getEmailAddress($context, $this->options['from']));
         $to = [];
@@ -87,6 +88,10 @@ protected function executeAction($context)
         $emailModel->setBody(
             $this->contextAccessor->getValue($context, $this->options['body'])
         );
+        if (array_key_exists('type', $this->options) && in_array($this->options['type'], ['txt', 'html'], true)) {
+            $type = $this->options['type'];
+        }
+        $emailModel->setType($type);
 
         $email = $this->emailProcessor->process($emailModel);