MAGETWO-60890: Fatal error logging in as admin user with restricted role

Sergii Kovalenko · Sergii Kovalenko · commit d9e6833eb25f · 2016-11-30T19:09:53.000+02:00
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -44,7 +44,9 @@ public function __construct(
      */
     public function get($path = '')
     {
-        if (!$this->data->getData($path) || empty($path)) {
+        $patchChunks = explode("/", $path);
+
+        if (!$this->data->getData($path) || count($patchChunks) == 1) {
             $this->data->addData($this->source->get($path));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,9 @@ public function __construct(`
`44`	`44`	`*/`
`45`	`45`	`public function get($path = '')`
`46`	`46`	`{`
`47`		`- if (!$this->data->getData($path) \|\| empty($path)) {`
	`47`	`+ $patchChunks = explode("/", $path);`
	`48`	`+`
	`49`	`+ if (!$this->data->getData($path) \|\| count($patchChunks) == 1) {`
`48`	`50`	`$this->data->addData($this->source->get($path));`
`49`	`51`	`}`
`50`	`52`