Verified Commit b66da186 authored by Lee Rowlands's avatar Lee Rowlands Committed by Lee Rowlands
Browse files

Issue #3305863 by mrshowerman, larowlan, shelane: Only getting email bin... 

Issue #3305863 by mrshowerman, larowlan, shelane: Only getting email bin attachment, collision with swiftmailer hook_mail params
parent 1b5c08fa

src/Plugin/QueueWorker/WorkbenchEmailProcessor.php

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ class WorkbenchEmailProcessor extends QueueWorkerBase implements ContainerFactor 
          'body' => $body,

          'template' => $template,

          'subject' => $subject,

          'format' => $format,

          'template_format' => $format,

          'entity' => $entity,

        ], $replyTo);

      }

workbench_email.module

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ function workbench_email_mail($key, &$message, $params) { 
  if (strpos($key, 'template::') === 0) {

    // Mailing one of our templates.

    $message['subject'] = $params['subject'];

    if ($params['format'] == 'html') {

    if ($params['template_format'] == 'html') {

      $message['headers']['Content-Type'] = 'text/html';

      $message['params']['convert'] = TRUE;

      $message['body'][] = $params['body'];