Bugfix: set Message::merge to true if either merge var or global merg…

…e var was set
slot · Jan 26, 2015 · d5d7b8c · d5d7b8c
1 parent 2f06daa
commit d5d7b8c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/Message.php b/Message.php
@@ -293,6 +293,8 @@ public function addGlobalMergeVar($name, $content)
             'name' => $name,
             'content' => $content,
         );
+
+        $this->setMerge(true);
 
         return $this;
     }
@@ -319,6 +321,8 @@ public function addMergeVar($recipient, $name, $content)
             )
         );
 
+        $this->setMerge(true);
+
         return $this;
     }
 

diff --git a/Tests/MessageTest.php b/Tests/MessageTest.php
@@ -156,4 +156,21 @@ public function testIsImportant()
         $this->assertEquals('High', $headers['Importance']);
         $this->assertEquals('urgent', $headers['Priority']);
     }
+
+    public function testSetMergeVar()
+    {
+        $message = new Message();
+        $this->assertEquals(false, $message->getMerge());
+        $message->addMergeVar('[email protected]', 'testkey', 'testvalue');
+        $this->assertEquals(true, $message->getMerge());
+    }
+
+    public function testSetGlobalMergeVar()
+    {
+        $message = new Message();
+        $this->assertEquals(false, $message->getMerge());
+        $message->addGlobalMergeVar('testkey', 'testvalue');
+        $this->assertEquals(true, $message->getMerge());
+    }
+
 }