MAGETWO-85539: fix adminhtml file attribute edit form #11267

magento · Dec 13, 2017 · 6692b5f · 6692b5f
2 parents a41dbed + dc85c24
commit 6692b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Customer/Model/FileUploader.php b/app/code/Magento/Customer/Model/FileUploader.php
@@ -110,7 +110,7 @@ public function upload()
         $result = $fileProcessor->saveTemporaryFile($this->scope . '[' . $this->getAttributeCode() . ']');
 
         // Update tmp_name param. Required for attribute validation!
-        $result['tmp_name'] = $result['path'] . '/' . ltrim($result['file'], '/');
+        $result['tmp_name'] = ltrim($result['file'], '/');
 
         $result['url'] = $fileProcessor->getViewUrl(
             FileProcessor::TMP_DIR . '/' . ltrim($result['name'], '/'),

diff --git a/app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php b/app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php
@@ -140,7 +140,7 @@ public function testUpload()
             'name' => $resultFileName,
             'file' => $resultFileName,
             'path' => $resultFilePath,
-            'tmp_name' => $resultFilePath . $resultFileName,
+            'tmp_name' => ltrim($resultFileName, '/'),
             'url' => $resultFileUrl,
         ];