Skip to content

Commit 26ca38c

Browse files
author
Dmitry Kologrivov
committed
Merge branch 'MAGETWO-44227-FIX-CONFIG-DATA' into 'master4'
MAGETWO-44227: changes for statics See merge request !174
2 parents 565ab1b + 3269108 commit 26ca38c

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

lib/internal/Magento/Framework/Config/FileResolver.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,18 @@ public function get($filename, $scope)
9090
if ($themeConfigFile
9191
&& $this->rootDirectory->isExist($this->rootDirectory->getRelativePath($themeConfigFile))
9292
) {
93-
$iterator[$this->rootDirectory->getRelativePath($themeConfigFile)] = $this->rootDirectory->readFile(
94-
$this->rootDirectory->getRelativePath($themeConfigFile)
95-
);
93+
$iterator[$this->rootDirectory->getRelativePath($themeConfigFile)] =
94+
$this->rootDirectory->readFile(
95+
$this->rootDirectory->getRelativePath(
96+
$themeConfigFile
97+
)
98+
);
9699
}
97100
$designPath =
98-
$this->componentRegistrar->getPath(ComponentRegistrar::THEME, $this->area . '/' . $this->themePath)
99-
. '/etc/view.xml';
101+
$this->componentRegistrar->getPath(
102+
ComponentRegistrar::THEME,
103+
$this->area . '/' . $this->themePath
104+
) . '/etc/view.xml';
100105
if (file_exists($designPath)) {
101106
try {
102107
$designDom = new \DOMDocument;

0 commit comments

Comments
 (0)