Skip to content
This repository was archived by the owner on Jun 1, 2018. It is now read-only.

Commit baac9ab

Browse files
Problem with mixed emails sent when made simultaneously on checkout solved. closes#147
1 parent 21e9d7e commit baac9ab

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

app/code/community/Ebizmarts/MageMonkey/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<config>
1111
<modules>
1212
<Ebizmarts_MageMonkey>
13-
<version>1.2.6</version>
13+
<version>1.2.6.1</version>
1414
</Ebizmarts_MageMonkey>
1515
</modules>
1616
<global>

app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,9 @@ public function getMail($storeId)
137137
if (!Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::ENABLE, $storeId)) {
138138
return parent::getMail();
139139
}
140-
if ($this->_mail) {
141-
return $this->_mail;
142-
} else {
143-
Mage::helper('ebizmarts_mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
144-
$this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
145-
return $this->_mail;
146-
}
140+
141+
Mage::helper('ebizmarts_mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
142+
$this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
143+
return $this->_mail;
147144
}
148145
}

app/code/community/Ebizmarts/Mandrill/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Ebizmarts_Mandrill>
5-
<version>2.0.11</version>
5+
<version>2.0.12</version>
66
</Ebizmarts_Mandrill>
77
</modules>
88
<global>

0 commit comments

Comments
 (0)