Skip to content

Commit b54b107

Browse files
committed
Merge remote-tracking branch 'falcon/MAGETWO-48516' into MAGETWO-60931
2 parents c9dc0fb + f2afc3b commit b54b107

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

app/code/Magento/Catalog/Model/Category/DataProvider.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta)
200200
if (
201201
!$attributePath
202202
|| !$canDisplayUseDefault
203-
|| in_array($attributeCode, $this->elementsWithUseConfigSetting
204-
)
203+
|| in_array($attributeCode, $this->elementsWithUseConfigSetting)
205204
) {
206205
continue;
207206
}

0 commit comments

Comments
 (0)