Merge pull request #100 from magento-commerce/1.1.18

1.1.18 Release
magento · Aug 12, 2022 · 7a3bd00 · 7a3bd00
2 parents 180402a + df8ce7b
commit 7a3bd00
Show file tree

Hide file tree

Showing 16 changed files with 2,528 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
  "name": "magento/quality-patches",
  "description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
  "type": "magento2-component",
- "version": "1.1.17",
+ "version": "1.1.18",
  "license": "proprietary",
  "repositories": {
  "repo": {

diff --git a/patches-info.json b/patches-info.json
diff --git a/patches/commerce/ACSD-45255_2.4.3-p1.patch b/patches/commerce/ACSD-45255_2.4.3-p1.patch
@@ -0,0 +1,15 @@
+diff --git a/vendor/magento/module-admin-gws/Plugin/CollectionFilter.php b/vendor/magento/module-admin-gws/Plugin/CollectionFilter.php
+index f54dd685ed4..6390bc8a00c 100644
+--- a/vendor/magento/module-admin-gws/Plugin/CollectionFilter.php
++++ b/vendor/magento/module-admin-gws/Plugin/CollectionFilter.php
+@@ -97,8 +97,8 @@ class CollectionFilter
+ private function filterCollection(AbstractCollection $collection)
+ {
+ if (!$this->role->getIsAll() && !$collection->getFlag(self::FILTERED_FLAG_NAME)) {
+- if (method_exists($collection, 'addStoreFilter')) {
+- $collection->addStoreFilter($this->getStoreIds());
++ if (method_exists($collection, 'addStoresFilter')) {
++ $collection->addStoresFilter($this->getStoreIds());
+ $collection->setFlag(self::FILTERED_FLAG_NAME, true);
+ } elseif (isset($collection->getSelect()->getPart(Select::FROM)['main_table'])) {
+ $this->tableBasedFilter($collection);