From fa4984cbaf7b381f1bdb76a4ea52228cc817613c Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 2 Jan 2016 11:23:29 +1100 Subject: [PATCH] Minor touch up Refs https://github.com/octobercms/october/pull/1665 --- modules/system/models/MailTemplate.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php index 500a78422..3b155f056 100644 --- a/modules/system/models/MailTemplate.php +++ b/modules/system/models/MailTemplate.php @@ -133,9 +133,8 @@ class MailTemplate extends Model /* * Subject */ - $swiftMessageSubject = $message->getSwiftMessage()->getSubject(); - - if (empty($swiftMessageSubject)) { + $customSubject = $message->getSwiftMessage()->getSubject(); + if (empty($customSubject)) { $message->subject(Twig::parse($template->subject, $data)); }