Merge branch 'master' into develop

mailup · Dec 5, 2018 · ff853c7 · ff853c7
2 parents f9d137d + 112474f
commit ff853c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/app/code/local/MailUp/MailUpSync/Model/Observer.php b/src/app/code/local/MailUp/MailUpSync/Model/Observer.php
@@ -200,6 +200,10 @@ public function leggiUtente($observer)
      */
     public function beforeSave($observer)
     {
+        if (isset($GLOBALS['__sl_mailup_save_from_webhook'])) {
+            return;
+        }
+
         $model = $observer->getEvent()->getDataObject();
 
         $confirm = Mage::getStoreConfig('mailup_newsletter/mailup/require_subscription_confirmation');
@@ -230,6 +234,10 @@ public function beforeSave($observer)
      */
 	public function sendUser($observer)
 	{
+        if (isset($GLOBALS['__sl_mailup_save_from_webhook'])) {
+            return $this;
+        }
+
         $model = $observer->getEvent()->getDataObject();
 
         // Ensure that (if called as singleton), this will only get called once per customer

diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/WebhookController.php b/src/app/code/local/MailUp/MailUpSync/controllers/WebhookController.php
@@ -42,7 +42,7 @@ public function subscribeAction()
             die();
         }
 
-        $GLOBALS["__sl_mailup_invia_utente"] = 1; //avoids observer
+        $GLOBALS['__sl_mailup_save_from_webhook'] = 1; //avoids observer
         $model
             ->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED)
             ->save();
@@ -88,7 +88,7 @@ public function unsubscribeAction()
             die();
         }
 
-        $GLOBALS["__sl_mailup_invia_utente"] = 1; //avoids observer
+        $GLOBALS['__sl_mailup_save_from_webhook'] = 1; //avoids observer
         $model
             ->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_UNSUBSCRIBED)
             ->save();