diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index a2935d502d8560edd9a6cdeab40d62d13cf00a0f..8aa7216a6b63928ba9dcdd415b1745ed404321f1 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -176,8 +176,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider { $meta = parent::getMeta(); $meta = $this->prepareMeta($meta); - $meta = $this->addUseDefaultValueCheckbox($this->getCurrentCategory(), $meta); - $meta = $this->resolveParentInheritance($this->getCurrentCategory(), $meta); + + $category = $this->getCurrentCategory(); + + if ($category) { + $meta = $this->addUseDefaultValueCheckbox($category, $meta); + $meta = $this->resolveParentInheritance($category, $meta); + } return $meta; }