Merge pull request #933 from mailchimp/Issue932-2.3

closes #932 for magento 2.3
mailchimp · Dec 4, 2019 · 9132164 · 9132164
2 parents 5236f96 + 72e2510
commit 9132164
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -1097,6 +1097,7 @@ public function getInterest($storeId)
                 }
             } else {
                 $this->log(__('Error retrieving interest groups for store ').$storeId);
+                $rc = [];
             }
         } catch (\Mailchimp_Error $e) {
             $this->log($e->getFriendlyMessage());
@@ -1115,12 +1116,12 @@ public function getSubscriberInterest($subscriberId, $storeId, $interest = null)
         $interestGroup = $this->_interestGroupFactory->create();
         $interestGroup->getBySubscriberIdStoreId($subscriberId, $storeId);
         $serialized = $interestGroup->getGroupdata();
-        if ($serialized) {
+        if ($serialized&&is_array($interest)&&count($interest)) {
             try {
                 $groups = $this->unserialize($serialized);
                 if (isset($groups['group'])) {
                     foreach ($groups['group'] as $key => $value) {
-                        if (isset($interest[$key])) {
+                        if (array_key_exists($interest,$key)) {
                             if (is_array($value)) {
                                 foreach ($value as $groupId) {
                                     foreach ($interest[$key]['category'] as $gkey => $gvalue) {