Merge pull request #50 from bakura10/mandrill-fix

Allow non template Mandrill messages to have variables
Webador · Sep 10, 2013 · 787f5df · 787f5df
2 parents a792ddf + cb602b7
commit 787f5df
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.1
+
+- Allow non-template Mandrill messages to have merge variables
+
 ## 1.1.0
 
 - Add support for Mandrill subaccounts API

diff --git a/src/SlmMail/Service/MandrillService.php b/src/SlmMail/Service/MandrillService.php
@@ -771,29 +771,29 @@ private function parseMessage(Message $message, $isTemplate)
                 if (!isset($parameters['template_content'])) {
                     $parameters['template_content'] = array();
                 }
+            }
+
+            foreach ($message->getGlobalVariables() as $key => $value) {
+                $parameters['message']['global_merge_vars'][] = array(
+                    'name'    => $key,
+                    'content' => $value
+                );
+            }
+
+            foreach ($message->getVariables() as $recipient => $variables) {
+                $recipientVariables = array();
 
-                foreach ($message->getGlobalVariables() as $key => $value) {
-                    $parameters['message']['global_merge_vars'][] = array(
+                foreach ($variables as $key => $value) {
+                    $recipientVariables[] = array(
                         'name'    => $key,
                         'content' => $value
                     );
                 }
 
-                foreach ($message->getVariables() as $recipient => $variables) {
-                    $recipientVariables = array();
-
-                    foreach ($variables as $key => $value) {
-                        $recipientVariables[] = array(
-                            'name'    => $key,
-                            'content' => $value
-                        );
-                    }
-
-                    $parameters['message']['merge_vars'][] = array(
-                        'rcpt' => $recipient,
-                        'vars' => $recipientVariables
-                    );
-                }
+                $parameters['message']['merge_vars'][] = array(
+                    'rcpt' => $recipient,
+                    'vars' => $recipientVariables
+                );
             }
 
             foreach ($message->getOptions() as $key => $value) {

diff --git a/src/SlmMail/Version.php b/src/SlmMail/Version.php
@@ -42,5 +42,5 @@
 
 class Version
 {
-    const VERSION = '1.1.0';
+    const VERSION = '1.1.1';
 }