Skip to content

Commit d57e0ec

Browse files
author
Karpenko, Oleksandr
committed
MAGETWO-57656: Base url should be processed while sending email
1 parent d449f67 commit d57e0ec

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

app/code/Magento/Email/Model/Template/Css/Processor.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010

1111
class Processor
1212
{
13-
/**
14-
* List of css placeholders
15-
*
16-
* @var array
17-
*/
18-
private $placeholders = [
19-
'base_url_path',
20-
'locale'
21-
];
22-
2313
/**
2414
* @var Repository
2515
*/
@@ -28,9 +18,8 @@ class Processor
2818
/**
2919
* @param Repository $assetRepository
3020
*/
31-
public function __construct(
32-
Repository $assetRepository
33-
) {
21+
public function __construct(Repository $assetRepository)
22+
{
3423
$this->assetRepository = $assetRepository;
3524
}
3625

app/code/Magento/Email/Model/Template/Filter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
namespace Magento\Email\Model\Template;
77

8-
use Magento\Framework\App\Filesystem\DirectoryList;
98
use Magento\Framework\App\ObjectManager;
109
use Magento\Framework\Filesystem;
10+
use Magento\Framework\Filesystem\Directory\ReadInterface;
1111
use Magento\Framework\View\Asset\ContentProcessorException;
1212
use Magento\Framework\View\Asset\ContentProcessorInterface;
1313

@@ -162,7 +162,7 @@ class Filter extends \Magento\Framework\Filter\Template
162162
private $cssProcessor;
163163

164164
/**
165-
* @var \Magento\Framework\Filesystem\Directory\ReadInterface
165+
* @var ReadInterface
166166
*/
167167
private $pubDirectory;
168168

@@ -231,7 +231,7 @@ private function getCssProcessor()
231231
/**
232232
* @deprecated
233233
* @param string $dirType
234-
* @return Filesystem\Directory\ReadInterface
234+
* @return ReadInterface
235235
*/
236236
private function getPubDirectory($dirType)
237237
{

app/code/Magento/Email/Test/Unit/Model/Template/Css/ProcessorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Emai\Test\Unit\Model\Template\Css;
6+
namespace Magento\Email\Test\Unit\Model\Template\Css;
77

88
use Magento\Email\Model\Template\Css\Processor;
99
use Magento\Framework\View\Asset\File\FallbackContext;

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Email\Test\Unit\Model\Template;
7+
78
use Magento\Email\Model\Template\Css\Processor;
89
use Magento\Email\Model\Template\Filter;
910
use Magento\Framework\App\Area;

0 commit comments

Comments
 (0)