From 289d900917eea84436fe0dcd01372e664097c6d8 Mon Sep 17 00:00:00 2001 From: Darko Goles Date: Thu, 5 Jul 2018 21:11:36 +0200 Subject: [PATCH] Fixed excluding Js files added with 'addJs' --- app/code/community/Lesti/Merge/Core/Model/Layout/Update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Lesti/Merge/Core/Model/Layout/Update.php b/app/code/community/Lesti/Merge/Core/Model/Layout/Update.php index 12c4a71..b63ec73 100644 --- a/app/code/community/Lesti/Merge/Core/Model/Layout/Update.php +++ b/app/code/community/Lesti/Merge/Core/Model/Layout/Update.php @@ -65,7 +65,7 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null foreach ($items as $item) { $paramsHandle = $handle; - if (in_array((string)$item->{'type'}, ['skin_js', 'js']) && $itemName = $this->_checkMatch($item, $excludeJs)) { + if ((in_array((string)$item->{'type'}, ['skin_js', 'js']) OR $method == 'addJs') && $itemName = $this->_checkMatch($item, $excludeJs)) { $paramsHandle = $itemName; } else if ((string)$item->{'type'} == 'skin_css' && $itemName = $this->_checkMatch($item, $excludeCss)) { $paramsHandle = $itemName;