MAGETWO-48544: Merge branch 'develop' of git://github.com/EliasKotlyar/magento2 into MAGETWO-48544

ishakhsuvarov · ishakhsuvarov · commit 16d16ab72149 · 2016-01-29T11:18:18.000+02:00
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -445,7 +445,9 @@ public function saveShipping($data, $customerAddressId)
                 if (!isset($data[$attributeCode])) {
                     $address->setData($attributeCode, null);
                 } else {
-                    $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);
+                    if(isset($compactedData[$attributeCode])){
+                        $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,9 @@ public function saveShipping($data, $customerAddressId)`
`445`	`445`	`if (!isset($data[$attributeCode])) {`
`446`	`446`	`$address->setData($attributeCode, null);`
`447`	`447`	`} else {`
`448`		`- $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);`
	`448`	`+ if(isset($compactedData[$attributeCode])){`
	`449`	`+ $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);`
	`450`	`+ }`
`449`	`451`	`}`
`450`	`452`	`}`
`451`	`453`