Merge branch 'dev_santisp'

mailchimp · Feb 22, 2017 · 1e24a73 · 1e24a73
2 parents c057979 + 93cae75
commit 1e24a73
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...ommunity/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/...ommunity/Ebizmarts/MailChimp/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/...community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/...community/Ebizmarts/MailChimp/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/lib/Mandrill/Mandrill/Exceptions.php b/lib/Mandrill/Mandrill/Exceptions.php
@@ -1,6 +1,5 @@
 <?php
-// This is an external library.
-// @codingStandardsIgnoreStart
+
 class Mandrill_Error extends Exception
 {
 }
@@ -211,5 +210,4 @@ class Mandrill_Metadata_FieldLimit extends Mandrill_Error
 class Mandrill_Unknown_MetadataField extends Mandrill_Error
 {
 }
-// @codingStandardsIgnoreEnd