MAGETWO-42954: Can't view uploaded image

Author: slavvka

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -81,6 +81,11 @@ protected function _extractData(
             $formData[$attributeCode] = isset($requestData[$attributeCode]) ? $requestData[$attributeCode] : false;
         }
 
+        $result = $metadataForm->compactData($formData);
+
+        // Re-initialize additional attributes
+        $formData = array_replace($formData, $result);
+
         // Unset unused attributes
         $formAttributes = $metadataForm->getAttributes();
         foreach ($formAttributes as $attribute) {
@@ -97,12 +102,7 @@ protected function _extractData(
             unset($formData['extension_attributes']);
         }
 
-        $result = $metadataForm->compactData($formData);
-
-        // Re-initialize additional attributes
-        $result = array_merge($result, array_diff_key($formData, $result));
-
-        return $result;
+        return $formData;
     }
 
     /**
@@ -228,7 +228,9 @@ public function execute()
                     ['customer' => $customer, 'request' => $this->getRequest()]
                 );
                 $customer->setAddresses($addresses);
-                $customer->setStoreId($customerData['sendemail_store_id']);
+                if (isset($customerData['sendemail_store_id'])) {
+                    $customer->setStoreId($customerData['sendemail_store_id']);
+                }
 
                 // Save customer
                 if ($customerId) {

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php

@@ -311,11 +311,13 @@ public function testExecuteWithExistentCustomer()
         $dataToCompact = [
             'entity_id' => $customerId,
             'code' => 'value',
+            'coolness' => false,
             'disable_auto_group_change' => 'false',
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
             'confirmation' => false,
             'sendemail_store_id' => false,
+            'extension_attributes' => false,
         ];
         $addressFilteredData = [
             'entity_id' => $addressId,
@@ -331,6 +333,7 @@ public function testExecuteWithExistentCustomer()
             'default_billing' => 'true',
             'default_shipping' => 'true',
             'code' => 'value',
+            'coolness' => false,
             'region' => 'region',
             'region_id' => 'region_id',
         ];
@@ -637,11 +640,13 @@ public function testExecuteWithNewCustomer()
             'disable_auto_group_change' => 'false',
         ];
         $dataToCompact = [
+            'coolness' => false,
             'disable_auto_group_change' => 'false',
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
             'confirmation' => false,
             'sendemail_store_id' => false,
+            'extension_attributes' => false,
         ];
         $addressFilteredData = [
             'entity_id' => $addressId,
@@ -657,6 +662,7 @@ public function testExecuteWithNewCustomer()
             'default_billing' => 'false',
             'default_shipping' => 'false',
             'code' => 'value',
+            'coolness' => false,
             'region' => 'region',
             'region_id' => 'region_id',
         ];
@@ -911,11 +917,13 @@ public function testExecuteWithNewCustomerAndValidationException()
             'disable_auto_group_change' => 'false',
         ];
         $dataToCompact = [
+            'coolness' => false,
             'disable_auto_group_change' => 'false',
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
             'confirmation' => false,
             'sendemail_store_id' => false,
+            'extension_attributes' => false,
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
@@ -1061,11 +1069,13 @@ public function testExecuteWithNewCustomerAndLocalizedException()
             'disable_auto_group_change' => 'false',
         ];
         $dataToCompact = [
+            'coolness' => false,
             'disable_auto_group_change' => 'false',
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
             'confirmation' => false,
             'sendemail_store_id' => false,
+            'extension_attributes' => false,
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
@@ -1211,11 +1221,13 @@ public function testExecuteWithNewCustomerAndException()
             'disable_auto_group_change' => 'false',
         ];
         $dataToCompact = [
+            'coolness' => false,
             'disable_auto_group_change' => 'false',
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
             'confirmation' => false,
             'sendemail_store_id' => false,
+            'extension_attributes' => false,
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */