MAGETWO-58335: [Backport] - Can't view uploaded image - for 2.1

Author: Alex Paliarush

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

@@ -41,6 +41,7 @@ protected function _extractCustomerData()
             ];
 
             $customerData = $this->_extractData(
+                $this->getRequest(),
                 'adminhtml_customer',
                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
                 $additionalAttributes,
@@ -61,24 +62,29 @@ protected function _extractCustomerData()
     /**
      * Perform customer data filtration based on form code and form object
      *
+     * @param \Magento\Framework\App\RequestInterface $request
      * @param string $formCode The code of EAV form to take the list of attributes from
      * @param string $entityType entity type for the form
      * @param string[] $additionalAttributes The list of attribute codes to skip filtration for
      * @param string $scope scope of the request
-     * @return array
+     * @param \Magento\Customer\Model\Metadata\Form $metadataForm to use for extraction
+     * @return array Filtered customer data
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _extractData(
+        \Magento\Framework\App\RequestInterface $request,
         $formCode,
         $entityType,
         $additionalAttributes = [],
-        $scope = null
+        $scope = null,
+        \Magento\Customer\Model\Metadata\Form $metadataForm = null
     ) {
-        $metadataForm = $this->getMetadataForm($entityType, $formCode, $scope);
-        $formData = $metadataForm->extractData($this->getRequest(), $scope);
+        $metadataForm = $metadataForm ? $metadataForm : $this->getMetadataForm($entityType, $formCode, $scope);
+        $formData = $metadataForm->extractData($request, $scope);
 
         // Initialize additional attributes
         /** @var \Magento\Framework\DataObject $object */
-        $object = $this->_objectFactory->create(['data' => $this->getRequest()->getPostValue()]);
+        $object = $this->_objectFactory->create(['data' => $request->getPostValue()]);
         $requestData = $object->getData($scope);
         foreach ($additionalAttributes as $attributeCode) {
             $formData[$attributeCode] = isset($requestData[$attributeCode]) ? $requestData[$attributeCode] : false;
@@ -123,6 +129,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
         foreach ($addressIdList as $addressId) {
             $scope = sprintf('address/%s', $addressId);
             $addressData = $this->_extractData(
+                $this->getRequest(),
                 'adminhtml_customer_address',
                 AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
                 ['default_billing', 'default_shipping'],

app/code/Magento/Customer/Model/Customer/DataProvider.php

@@ -127,10 +127,8 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param CustomerCollectionFactory $customerCollectionFactory
      * @param Config $eavConfig
      * @param FilterPool $filterPool
-     * @param FileProcessorFactory $fileProcessorFactory
      * @param array $meta
      * @param array $data
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         $name,
@@ -140,7 +138,6 @@ public function __construct(
         CustomerCollectionFactory $customerCollectionFactory,
         Config $eavConfig,
         FilterPool $filterPool,
-        FileProcessorFactory $fileProcessorFactory = null,
         array $meta = [],
         array $data = []
     ) {
@@ -150,7 +147,6 @@ public function __construct(
         $this->collection->addAttributeToSelect('*');
         $this->eavConfig = $eavConfig;
         $this->filterPool = $filterPool;
-        $this->fileProcessorFactory = $fileProcessorFactory ?: $this->getFileProcessorFactory();
         $this->meta['customer']['children'] = $this->getAttributesMeta(
             $this->eavConfig->getEntityType('customer')
         );