Allow custom subjects when mailing

Refs octobercms/october#1665
octobercms · Jan 2, 2016 · 7b79dac · 7b79dac
1 parent 7c41953
commit 7b79dac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Mail/Mailer.php b/src/Mail/Mailer.php
@@ -217,7 +217,14 @@ protected function addContent($message, $view, $plain, $raw, $data)
                 $text = $result['text'];
             }
 
-            if ($subject = array_get($result['settings'], 'subject')) {
+            /*
+             * Subject
+             */
+            $customSubject = $message->getSwiftMessage()->getSubject();
+            if (
+                empty($customSubject) &&
+                ($subject = array_get($result['settings'], 'subject'))
+            ) {
                 $message->subject($subject);
             }
         }