MAGETWO-15371: view.xml file inheritance not working properly

shiftedreality · shiftedreality · commit a6fa9baaa19a · 2016-03-02T16:59:51.000+02:00
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -159,6 +159,7 @@ public function getParents($filename, $scope)
      *
      * @param ThemeInterface $theme
      * @param array $iterator
+     * @param int $index
      * @return array
      */
     private function getParentConfigs(ThemeInterface $theme, array $iterator, $index = 0)
@@ -176,7 +177,7 @@ private function getParentConfigs(ThemeInterface $theme, array $iterator, $index
 
             $iterator[$index] = $parentDom->saveXML();
 
-            $iterator = $this->getParentConfigs($theme->getParentTheme(), $iterator);
+            $iterator = $this->getParentConfigs($theme->getParentTheme(), $iterator, ++$index);
         }
 
         return $iterator;

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ public function getParents($filename, $scope)`
`159`	`159`	`*`
`160`	`160`	`* @param ThemeInterface $theme`
`161`	`161`	`* @param array $iterator`
	`162`	`+ * @param int $index`
`162`	`163`	`* @return array`
`163`	`164`	`*/`
`164`	`165`	`private function getParentConfigs(ThemeInterface $theme, array $iterator, $index = 0)`
`@@ -176,7 +177,7 @@ private function getParentConfigs(ThemeInterface $theme, array $iterator, $index`
`176`	`177`
`177`	`178`	`$iterator[$index] = $parentDom->saveXML();`
`178`	`179`
`179`		`- $iterator = $this->getParentConfigs($theme->getParentTheme(), $iterator);`
	`180`	`+ $iterator = $this->getParentConfigs($theme->getParentTheme(), $iterator, ++$index);`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`return $iterator;`