diff -Nuar a/vendor/magento/module-customer/CustomerData/SectionConfigConverter.php b/vendor/magento/module-customer/CustomerData/SectionConfigConverter.php index 5f4bbb03d39..c9a93c708e3 100644 --- a/vendor/magento/module-customer/CustomerData/SectionConfigConverter.php +++ b/vendor/magento/module-customer/CustomerData/SectionConfigConverter.php @@ -5,6 +5,9 @@ */ namespace Magento\Customer\CustomerData; +/** + * Class that receives xml merged source and process it. + */ class SectionConfigConverter implements \Magento\Framework\Config\ConverterInterface { /** @@ -13,7 +16,7 @@ class SectionConfigConverter implements \Magento\Framework\Config\ConverterInter const INVALIDATE_ALL_SECTIONS_MARKER = '*'; /** - * {@inheritdoc} + * @inheritdoc */ public function convert($source) { @@ -21,10 +24,18 @@ class SectionConfigConverter implements \Magento\Framework\Config\ConverterInter foreach ($source->getElementsByTagName('action') as $action) { $actionName = strtolower($action->getAttribute('name')); foreach ($action->getElementsByTagName('section') as $section) { - $sections[$actionName][] = strtolower($section->getAttribute('name')); + $sectionName = strtolower($section->getAttribute('name')); + + if ($sectionName === self::INVALIDATE_ALL_SECTIONS_MARKER) { + $sections[$actionName] = []; + $sections[$actionName][] = self::INVALIDATE_ALL_SECTIONS_MARKER; + break; + } else { + $sections[$actionName][] = $sectionName; + } } if (!isset($sections[$actionName])) { - $sections[$actionName] = self::INVALIDATE_ALL_SECTIONS_MARKER; + $sections[$actionName][] = self::INVALIDATE_ALL_SECTIONS_MARKER; } } return [ diff -Nuar a/vendor/magento/module-customer/etc/frontend/sections.xml b/vendor/magento/module-customer/etc/frontend/sections.xml index 7938f28590c..e6a45dfdeaa 100644 --- a/vendor/magento/module-customer/etc/frontend/sections.xml +++ b/vendor/magento/module-customer/etc/frontend/sections.xml @@ -7,10 +7,18 @@ --> - - - - + +
+ + +
+ + +
+ + +
+
diff -Nuar a/vendor/magento/module-directory/etc/frontend/sections.xml b/vendor/magento/module-directory/etc/frontend/sections.xml index a2bc5696abf..48d63ec82d9 100644 --- a/vendor/magento/module-directory/etc/frontend/sections.xml +++ b/vendor/magento/module-directory/etc/frontend/sections.xml @@ -7,5 +7,7 @@ --> - + +
+ diff -Nuar a/vendor/magento/module-store/etc/frontend/sections.xml b/vendor/magento/module-store/etc/frontend/sections.xml index b7dbfe40526..85f3627e05c 100644 --- a/vendor/magento/module-store/etc/frontend/sections.xml +++ b/vendor/magento/module-store/etc/frontend/sections.xml @@ -7,6 +7,10 @@ --> - - + +
+ + +
+