MAGETWO-66795: Fix merging nested <var /> in view.xml #7556

Oleksii Korshenko · Oleksii Korshenko · commit e75f89bf4135 · 2017-04-11T12:54:52.000-07:00
- Merge Pull Request #7556 from torreytsui/magento2:patch-3
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
@@ -152,7 +152,7 @@ protected function getIdAttributes()
     {
         $idAttributes = [
             '/view/vars' => 'module',
-            '/view/vars/var' => 'name',
+            '/view/vars/(var/)*var' => 'name',
             '/view/exclude/item' => ['type', 'item'],
         ];
         foreach ($this->xpath as $attribute) {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected function getIdAttributes()`
`152`	`152`	`{`
`153`	`153`	`$idAttributes = [`
`154`	`154`	`'/view/vars' => 'module',`
`155`		`- '/view/vars/var' => 'name',`
	`155`	`+ '/view/vars/(var/)*var' => 'name',`
`156`	`156`	`'/view/exclude/item' => ['type', 'item'],`
`157`	`157`	`];`
`158`	`158`	`foreach ($this->xpath as $attribute) {`