File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed
lib/internal/Magento/Framework/Config Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -171,10 +171,11 @@ protected function _mergeNode(\DOMElement $node, $parentPath)
171
171
/* Update matched node attributes and value */
172
172
if ($ matchedNode ) {
173
173
//different node type
174
- if ($ this ->typeAttributeName &&
174
+ if (( $ this ->typeAttributeName &&
175
175
$ node ->hasAttribute ($ this ->typeAttributeName ) &&
176
176
$ matchedNode ->hasAttribute ($ this ->typeAttributeName ) &&
177
- $ node ->getAttribute ($ this ->typeAttributeName ) !== $ matchedNode ->getAttribute ($ this ->typeAttributeName )
177
+ $ node ->getAttribute ($ this ->typeAttributeName ) !== $ matchedNode ->getAttribute ($ this ->typeAttributeName ))
178
+ || ($ node ->tagName === 'column ' )
178
179
) {
179
180
$ parentMatchedNode = $ this ->_getMatchedNode ($ parentPath );
180
181
$ newNode = $ this ->dom ->importNode ($ node , true );
You can’t perform that action at this time.
0 commit comments