refs #2174 add an import directory only if the asset contains an @import. Fixes a file named admin.less file in any plugin overwrites the admin.less file in Morpheus plugin

1 files changed, 6 insertions, 1 deletions

diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
index 633443ef6f..b135cc0e82 100644
--- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -31,7 +31,12 @@ class StylesheetUIAssetMerger extends UIAssetMerger
     protected function getMergedAssets()
     {
         foreach($this->getAssetCatalog()->getAssets() as $uiAsset) {
-            $this->lessCompiler->addImportDir(dirname($uiAsset->getAbsoluteLocation()));
+
+            $content = $uiAsset->getContent();
+            if (false !== strpos($content, '@import')) {
+                $this->lessCompiler->addImportDir(dirname($uiAsset->getAbsoluteLocation()));
+            }
+
         }
 
         return $this->lessCompiler->compile($this->getConcatenatedAssets());