From a3c2994167e8a0091c3fe0ba8ff5a41382d2e099 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Wed, 6 Apr 2016 16:54:20 +0300
Subject: [PATCH] MAGETWO-50912: Custom Customer Attributes not saving at
 checkout

---
 app/code/Magento/Customer/Model/Address/AbstractAddress.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 6855eb242e6..1851f858b99 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -263,7 +263,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
     {
         if (is_array($key)) {
             $key = $this->_implodeArrayField($key);
-        } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
+        } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
             $value = $this->_implodeArrayValues($value);
         }
         return parent::setData($key, $value);
-- 
GitLab