Skip to content

Commit 651da5a

Browse files
committed
Merge remote-tracking branch 'falcon/MAGETWO-48516' into MAGETWO-60931
2 parents b54b107 + 15fdb0e commit 651da5a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,13 @@ public function getMeta()
176176
{
177177
$meta = parent::getMeta();
178178
$meta = $this->prepareMeta($meta);
179-
$meta = $this->addUseDefaultValueCheckbox($this->getCurrentCategory(), $meta);
180-
$meta = $this->resolveParentInheritance($this->getCurrentCategory(), $meta);
179+
180+
$category = $this->getCurrentCategory();
181+
182+
if ($category) {
183+
$meta = $this->addUseDefaultValueCheckbox($category, $meta);
184+
$meta = $this->resolveParentInheritance($category, $meta);
185+
}
181186

182187
return $meta;
183188
}

0 commit comments

Comments
 (0)