Merge branch 'MDVA-177' into 2.0.5_backlog

Author: isitnikov

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -399,6 +399,11 @@ public function subscribe($email)
             $this->setSubscriberConfirmCode($this->randomSequence());
         }
 
+        $sendConfirmationEmail = true;
+        if ($this->getStatus() == self::STATUS_SUBSCRIBED && !$this->getCustomerId()) {
+            $sendConfirmationEmail = false;
+        }
+
         $isConfirmNeed = $this->_scopeConfig->getValue(
             self::XML_PATH_CONFIRMATION_FLAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -442,12 +447,14 @@ public function subscribe($email)
         $this->setStatusChanged(true);
 
         try {
-            if ($isConfirmNeed === true
-                && $isOwnSubscribes === false
-            ) {
-                $this->sendConfirmationRequestEmail();
-            } else {
-                $this->sendConfirmationSuccessEmail();
+            if ($sendConfirmationEmail === true) {
+                if ($isConfirmNeed === true
+                    && $isOwnSubscribes === false
+                ) {
+                    $this->sendConfirmationRequestEmail();
+                } else {
+                    $this->sendConfirmationSuccessEmail();
+                }
             }
             $this->save();
             return $this->getStatus();