From 9cf446fb3e920551103e9a2200096fbf12da27a6 Mon Sep 17 00:00:00 2001
From: Prince Patel <mail.mageprince@gmail.com>
Date: Mon, 9 Jul 2018 23:58:44 +0530
Subject: [PATCH 1/2] Update AbstractTemplate.php

---
 app/code/Magento/Email/Model/AbstractTemplate.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index a6ecdaf24ebbb..36f562cd24187 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Email\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -396,8 +395,8 @@ protected function getLogoUrl($store)
             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
                 return $this->storeManager->getStore()->getBaseUrl(
-                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-                ) . $uploadDir . '/' . $fileName;
+                        \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                    ) . $uploadDir . '/' . $fileName;
             }
         }
         return $this->getDefaultEmailLogo();
@@ -534,10 +533,9 @@ protected function cancelDesignConfig()
      */
     public function setForcedArea($templateId)
     {
-        if ($this->area === null) {
+        if (!isset($this->area)) {
             $this->area = $this->emailConfig->getTemplateArea($templateId);
         }
-
         return $this;
     }
 

From efc2d935d23f3529b5ed48e69ff6fe86940d2293 Mon Sep 17 00:00:00 2001
From: Prince Patel <mail.mageprince@gmail.com>
Date: Tue, 10 Jul 2018 00:08:27 +0530
Subject: [PATCH 2/2] Update AbstractTemplate.php

---
 app/code/Magento/Email/Model/AbstractTemplate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 36f562cd24187..1d4986e8a6f4a 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -395,8 +395,8 @@ protected function getLogoUrl($store)
             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
                 return $this->storeManager->getStore()->getBaseUrl(
-                        \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-                    ) . $uploadDir . '/' . $fileName;
+                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                ) . $uploadDir . '/' . $fileName;
             }
         }
         return $this->getDefaultEmailLogo();