diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index e0ed4e0b..ff601a9e 100644
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -403,7 +403,7 @@ protected function _createNewCoupon($store, $email)
$websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
$collection = Mage::getModel('salesrule/rule')->getCollection()
->addFieldToFilter('name', array('like' => 'Abandoned coupon ' . $email))
- ->addFieldToFilter('website_id', array('eq' => $websiteid));
+ ->addFieldToFilter('website_ids', array('eq' => $websiteid));
if (!count($collection)) {
$fromDate = date("Y-m-d");
diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index b2b8e146..3e8dbe62 100644
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -895,7 +895,7 @@ protected function _createNewCoupon($store, $email, $string)
$websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
$collection = Mage::getModel('salesrule/rule')->getCollection()
->addFieldToFilter('name', array('like' => $string . $email))
- ->addFieldToFilter('website_id', array('eq' => $websiteid));
+ ->addFieldToFilter('website_ids', array('eq' => $websiteid));
if (!count($collection)) {
$couponamount = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_DISCOUNT, $store);
diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml
index b2484229..1861d51b 100644
--- a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml
+++ b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml
@@ -112,7 +112,7 @@
adminhtml/system_config_source_order_status
23
1
- 0
+ 1
1
diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
index af290994..f62373a1 100644
--- a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
$subscriberFirstName = $row->getData('subscriber_firstname');
$customerFirstName = $row->getData('customer_firstname');
if ($customerFirstName) {
- return $customerFirstName;
+ return $this->escapeHtml($customerFirstName);
} elseif ($subscriberFirstName) {
- return $subscriberFirstName;
+ return $this->escapeHtml($subscriberFirstName);
} else {
return '----';
}
diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
index af9179c7..ea85c6c5 100644
--- a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
$subscriberLastName = $row->getData('subscriber_lastname');
$customerLastName = $row->getData('customer_lastname');
if ($customerLastName) {
- return $customerLastName;
+ return $this->escapeHtml($customerLastName);
} elseif ($subscriberLastName) {
- return $subscriberLastName;
+ return $this->escapeHtml($subscriberLastName);
} else {
return '----';
}
diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
index d20ad918..6b0263be 100755
--- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
+++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
@@ -10,7 +10,7 @@
- 1.2.8
+ 1.2.9
diff --git a/lib/Mandrill/Message.php b/lib/Mandrill/Message.php
index c0a73e25..9eb4f5b8 100644
--- a/lib/Mandrill/Message.php
+++ b/lib/Mandrill/Message.php
@@ -194,7 +194,7 @@ public function addHeader($name, $value, $append = false)
throw new Zend_Mail_Exception('Cannot set standard header from addHeader()');
}
- $this->_header[$name] = $value;
+ $this->_headers[$name] = $value;
return $this;
}