MAGETWO-57291: [Backport] Logo Email for transactional emails can not be uploaded successfully - for 2.1

Author: zakdma

app/code/Magento/Config/Model/Config/Backend/Email/Logo.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\Config\Model\Config\Backend\Email;
 
+/**
+ * @deprecated
+ */
 class Logo extends \Magento\Config\Model\Config\Backend\Image
 {
     /**

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -389,7 +389,7 @@ protected function getLogoUrl($store)
             $store
         );
         if ($fileName) {
-            $uploadDir = \Magento\Config\Model\Config\Backend\Email\Logo::UPLOAD_DIR;
+            $uploadDir = \Magento\Email\Model\Design\Backend\Logo::UPLOAD_DIR;
             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
                 return $this->storeManager->getStore()->getBaseUrl(

app/code/Magento/Email/Model/Design/Backend/Logo.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Email\Model\Design\Backend;
+
+use Magento\Theme\Model\Design\Backend\Logo as DesignLogo;
+
+/**
+ * Class to handle email logo image
+ */
+class Logo extends DesignLogo
+{
+    /**
+     * The tail part of directory path for uploading.
+     */
+    const UPLOAD_DIR = 'email/logo';
+
+    /**
+     * Upload max file size in kilobytes
+     *
+     * @var int
+     */
+    protected $maxFileSize = 2048;
+
+    /**
+     * Getter for allowed extensions of uploaded files.
+     *
+     * @return string[]
+     */
+    public function getAllowedExtensions()
+    {
+        return ['jpg', 'jpeg', 'gif', 'png'];
+    }
+}

app/code/Magento/Email/composer.json

@@ -6,6 +6,7 @@
         "magento/module-config": "100.1.*",
         "magento/module-store": "100.1.*",
         "magento/module-cms": "101.0.*",
+        "magento/module-theme": "100.1.*",
         "magento/module-backend": "100.1.*",
         "magento/module-variable": "100.1.*",
         "magento/framework": "100.1.*"

app/code/Magento/Email/etc/di.xml

@@ -27,7 +27,7 @@
                 <item name="email_logo" xsi:type="array">
                     <item name="path" xsi:type="string">design/email/logo</item>
                     <item name="fieldset" xsi:type="string">other_settings/email</item>
-                    <item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Logo</item>
+                    <item name="backend_model" xsi:type="string">Magento\Email\Model\Design\Backend\Logo</item>
                     <item name="base_url" xsi:type="array">
                         <item name="type" xsi:type="string">media</item>
                         <item name="scope_info" xsi:type="string">1</item>

app/code/Magento/Email/etc/module.xml

@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Cms"/>
+            <module name="Magento_Theme"/>
         </sequence>
     </module>
 </config>

app/code/Magento/Theme/Model/Design/Backend/Logo.php

@@ -21,7 +21,7 @@ class Logo extends Image
      */
     protected function _getUploadDir()
     {
-        return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(self::UPLOAD_DIR));
+        return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(static::UPLOAD_DIR));
     }
 
     /**