Skip to content

Commit e63ad75

Browse files
committed
MAGETWO-57291: [Backport] Logo Email for transactional emails can not be uploaded successfully - for 2.1
1 parent 7ea39cd commit e63ad75

File tree

7 files changed

+44
-3
lines changed

7 files changed

+44
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\Config\Model\Config\Backend\Email;
1313

14+
/**
15+
* @deprecated
16+
*/
1417
class Logo extends \Magento\Config\Model\Config\Backend\Image
1518
{
1619
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ protected function getLogoUrl($store)
389389
$store
390390
);
391391
if ($fileName) {
392-
$uploadDir = \Magento\Config\Model\Config\Backend\Email\Logo::UPLOAD_DIR;
392+
$uploadDir = \Magento\Email\Model\Design\Backend\Logo::UPLOAD_DIR;
393393
$mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
394394
if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
395395
return $this->storeManager->getStore()->getBaseUrl(
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Email\Model\Design\Backend;
7+
8+
use Magento\Theme\Model\Design\Backend\Logo as DesignLogo;
9+
10+
/**
11+
* Class to handle email logo image
12+
*/
13+
class Logo extends DesignLogo
14+
{
15+
/**
16+
* The tail part of directory path for uploading.
17+
*/
18+
const UPLOAD_DIR = 'email/logo';
19+
20+
/**
21+
* Upload max file size in kilobytes
22+
*
23+
* @var int
24+
*/
25+
protected $maxFileSize = 2048;
26+
27+
/**
28+
* Getter for allowed extensions of uploaded files.
29+
*
30+
* @return string[]
31+
*/
32+
public function getAllowedExtensions()
33+
{
34+
return ['jpg', 'jpeg', 'gif', 'png'];
35+
}
36+
}

app/code/Magento/Email/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"magento/module-config": "100.1.*",
77
"magento/module-store": "100.1.*",
88
"magento/module-cms": "101.0.*",
9+
"magento/module-theme": "100.1.*",
910
"magento/module-backend": "100.1.*",
1011
"magento/module-variable": "100.1.*",
1112
"magento/framework": "100.1.*"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<item name="email_logo" xsi:type="array">
2828
<item name="path" xsi:type="string">design/email/logo</item>
2929
<item name="fieldset" xsi:type="string">other_settings/email</item>
30-
<item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Logo</item>
30+
<item name="backend_model" xsi:type="string">Magento\Email\Model\Design\Backend\Logo</item>
3131
<item name="base_url" xsi:type="array">
3232
<item name="type" xsi:type="string">media</item>
3333
<item name="scope_info" xsi:type="string">1</item>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<sequence>
1111
<module name="Magento_Store"/>
1212
<module name="Magento_Cms"/>
13+
<module name="Magento_Theme"/>
1314
</sequence>
1415
</module>
1516
</config>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Logo extends Image
2121
*/
2222
protected function _getUploadDir()
2323
{
24-
return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(self::UPLOAD_DIR));
24+
return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(static::UPLOAD_DIR));
2525
}
2626

2727
/**

0 commit comments

Comments
 (0)