Skip to content

Commit b8d2663

Browse files
committed
resolve magento 2.3 update conflicts
1 parent 4a28372 commit b8d2663

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
6565
}
6666

6767
$fieldsInQuery = $this->queryFields->getFieldsUsedInQuery();
68-
if (isset($data['fields']) && !empty($fieldsInQuery)) {
69-
foreach ($data['fields'] as $fieldName => $fieldConfig) {
70-
if (!isset($fieldsInQuery[$fieldName])) {
71-
unset($data['fields'][$fieldName]);
68+
if (isset($data['fields'])) {
69+
if (!empty($fieldsInQuery)) {
70+
foreach ($data['fields'] as $fieldName => $fieldConfig) {
71+
if (!isset($fieldsInQuery[$fieldName])) {
72+
unset($data['fields'][$fieldName]);
73+
}
7274
}
7375
}
7476

0 commit comments

Comments
 (0)