diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php index 83db8c0dec3b1..6b7db5c7ed171 100644 --- a/app/code/Magento/PageCache/Model/Config.php +++ b/app/code/Magento/PageCache/Model/Config.php @@ -199,18 +199,18 @@ protected function _getReplacements() */ protected function _getAccessList() { - $result = ''; - $tpl = " \"%s\";"; + $tpl = ' "%s";'; $accessList = $this->_scopeConfig->getValue(self::XML_VARNISH_PAGECACHE_ACCESS_LIST); if (!empty($accessList)) { - $result = []; + $ipsList = []; $ips = explode(',', $accessList); foreach ($ips as $ip) { - $result[] = sprintf($tpl, trim($ip)); + $ipsList[] = sprintf($tpl, trim($ip)); } - return implode("\n", $result); + return implode("\n", $ipsList); } - return $result; + + return ''; } /** diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php index ed9e38822245f..1ae5d7479952b 100644 --- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php +++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php @@ -85,11 +85,9 @@ public function sendCopyTo() $copyTo = $this->identityContainer->getEmailCopyTo(); if (!empty($copyTo) && $this->identityContainer->getCopyMethod() == 'copy') { + $this->configureEmailTemplate(); foreach ($copyTo as $email) { - $this->configureEmailTemplate(); - $this->transportBuilder->addTo($email); - $transport = $this->transportBuilder->getTransport(); $transport->sendMessage(); }