Substitute subject, from name

Author: rajumsys

trunk/mailer.http.class.php

@@ -48,11 +48,11 @@ function sparkpostSend()
     protected function get_request_body()
     {
         $tracking_enabled = !!$this->options['enable_tracking'];
-
+        $sender = $this->get_sender();
         $body = array(
             'recipients' => $this->get_recipients(),
             'content' => array(
-                'from' => $this->get_sender(),
+                'from' => $sender,
                 'subject' => $this->Subject,
                 'headers' => $this->get_headers()
             ),
@@ -65,6 +65,8 @@ protected function get_request_body()
         if (!empty($this->options['template'])) {
           $body['content']['template_id'] = $this->options['template'];
           $body['substitution_data']['content'] = $this->Body;
+          $body['substitution_data']['subject'] = $this->Subject;
+          $body['substitution_data']['from_name'] = $sender['name'];
         } else {
           switch($this->ContentType) {
               case 'multipart/alternative':