Skip to content

Commit 6dae70c

Browse files
authored
update logic check
1 parent 7daa881 commit 6dae70c

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

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

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,20 @@ protected function replace(array $matchedContent, LocalInterface $asset)
140140
$moduleName = $importFile->getModule();
141141
$referenceString = $isReference ? '(reference) ' : '';
142142

143-
if (!$deployOnlyEnabled) {
144-
$importsContent .= $moduleName
145-
? "@import $referenceString'{$moduleName}::{$resolvedPath}';\n"
146-
: "@import $referenceString'{$matchedFileId}';\n";
143+
if (!$moduleName) {
144+
$importsContent .= "@import $referenceString'{$matchedFileId}';\n";
147145
}
148146

149-
if ($deployOnlyEnabled) {
150-
if (($moduleName && !$this->moduleManager->isEnabled($moduleName)) ||
151-
"" === ($matchedFileId) ||
152-
null === ($matchedFileId)) {
153-
continue;
154-
}
147+
if ($moduleName) {
148+
if (!$deployOnlyEnabled) {
149+
$importsContent .= "@import $referenceString'{$moduleName}::{$resolvedPath}';\n";
150+
} else {
151+
if (!$this->moduleManager->isEnabled($moduleName)) {
152+
continue;
153+
}
155154

156-
if (!$moduleName && !empty($matchedFileId)) {
157-
$importsContent .= "@import $referenceString'{$matchedFileId}';\n";
158-
}
155+
$importsContent .= "@import $referenceString'{$moduleName}::{$resolvedPath}';\n";
159156

160-
if ($moduleName && $this->moduleManager->isEnabled($moduleName)) {
161-
$importsContent .= $moduleName
162-
? "@import $referenceString'{$moduleName}::{$resolvedPath}';\n"
163-
: "@import $referenceString'{$matchedFileId}';\n";
164157
}
165158
}
166159
}

0 commit comments

Comments
 (0)