File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
app/code/Magento/Config/App/Config/Type Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -155,7 +155,11 @@ public function get($path = '')
155
155
}
156
156
$ scopeId = array_shift ($ pathParts );
157
157
if (!isset ($ this ->data [$ scopeType ][$ scopeId ])) {
158
- $ this ->data = array_replace_recursive ($ this ->loadScopeData ($ scopeType , $ scopeId ), $ this ->data );
158
+ $ scopeData = $ this ->loadScopeData ($ scopeType , $ scopeId );
159
+ /* Starting from 2.2.0 $this->data can be already loaded with $this->loadScopeData */
160
+ if (!isset ($ this ->data [$ scopeType ][$ scopeId ])) {
161
+ $ this ->data = array_replace_recursive ($ scopeData , $ this ->data );
162
+ }
159
163
}
160
164
return isset ($ this ->data [$ scopeType ][$ scopeId ])
161
165
? $ this ->getDataByPathParts ($ this ->data [$ scopeType ][$ scopeId ], $ pathParts )
You can’t perform that action at this time.
0 commit comments