Skip to content

Commit e0a13e9

Browse files
Fixed bug when static content deploys including static data from disabled modules.
1 parent ea71192 commit e0a13e9

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
1414
use Magento\Framework\View\DesignInterface;
1515
use Magento\Framework\View\File\CollectorInterface;
16+
use Magento\Framework\Module\ModuleManagerInterface;
1617

1718
/**
1819
* @magento_import instruction preprocessor
@@ -57,25 +58,33 @@ class MagentoImport implements PreProcessorInterface
5758
*/
5859
private $themeProvider;
5960

61+
/**
62+
* @var ModuleManagerInterface
63+
*/
64+
private $moduleManager;
65+
6066
/**
6167
* @param DesignInterface $design
6268
* @param CollectorInterface $fileSource
6369
* @param ErrorHandlerInterface $errorHandler
6470
* @param \Magento\Framework\View\Asset\Repository $assetRepo
6571
* @param \Magento\Framework\View\Design\Theme\ListInterface $themeList
72+
* @param ModuleManagerInterface $moduleManager
6673
*/
6774
public function __construct(
6875
DesignInterface $design,
6976
CollectorInterface $fileSource,
7077
ErrorHandlerInterface $errorHandler,
7178
\Magento\Framework\View\Asset\Repository $assetRepo,
72-
\Magento\Framework\View\Design\Theme\ListInterface $themeList
79+
\Magento\Framework\View\Design\Theme\ListInterface $themeList,
80+
ModuleManagerInterface $moduleManager
7381
) {
7482
$this->design = $design;
7583
$this->fileSource = $fileSource;
7684
$this->errorHandler = $errorHandler;
7785
$this->assetRepo = $assetRepo;
7886
$this->themeList = $themeList;
87+
$this->moduleManager = $moduleManager;
7988
}
8089

8190
/**
@@ -108,6 +117,9 @@ protected function replace(array $matchedContent, LocalInterface $asset)
108117
$importFiles = $this->fileSource->getFiles($this->getTheme($relatedAsset), $resolvedPath);
109118
/** @var $importFile \Magento\Framework\View\File */
110119
foreach ($importFiles as $importFile) {
120+
if ($importFile->getModule() && !$this->moduleManager->isEnabled($importFile->getModule())) {
121+
continue;
122+
}
111123
$referenceString = $isReference ? '(reference) ' : '';
112124
$importsContent .= $importFile->getModule()
113125
? "@import $referenceString'{$importFile->getModule()}::{$resolvedPath}';\n"

0 commit comments

Comments
 (0)