diff --git a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php index 2de8b922052e0..0502026ec1e8e 100644 --- a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php +++ b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php @@ -95,12 +95,14 @@ protected function getListForEntity(array $metadata, $entityTypeCode, MetadataMa if ($entityTypeCode == AddressMetadataInterface::ENTITY_TYPE_ADDRESS) { $attributeCode = self::BILLING_ADDRESS_PREFIX . $attribute->getAttributeCode(); } + $attributeOptions = $attribute->getOptions(); $attributes[$attributeCode] = [ AttributeMetadataInterface::ATTRIBUTE_CODE => $attributeCode, AttributeMetadataInterface::FRONTEND_INPUT => $attribute->getFrontendInput(), AttributeMetadataInterface::FRONTEND_LABEL => $attribute->getFrontendLabel(), AttributeMetadataInterface::BACKEND_TYPE => $attribute->getBackendType(), - AttributeMetadataInterface::OPTIONS => $this->getOptionArray($attribute->getOptions()), + AttributeMetadataInterface::OPTIONS => is_array($attributeOptions) + ? $this->getOptionArray($attributeOptions) : [], AttributeMetadataInterface::IS_USED_IN_GRID => $attribute->getIsUsedInGrid(), AttributeMetadataInterface::IS_VISIBLE_IN_GRID => $attribute->getIsVisibleInGrid(), AttributeMetadataInterface::IS_FILTERABLE_IN_GRID => $management->canBeFilterableInGrid($attribute),