Merge pull request #86 from shahroq/feature/show-informative-error-ms…

…g-when-adding-content-to-batch address #83: show informative error msg when adding content to batch
concretecms · Feb 14, 2020 · f3e23da · f3e23da
2 parents 95f1d84 + e47e400
commit f3e23da
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/migration_tool/controllers/single_page/dashboard/system/migration/import.php b/packages/migration_tool/controllers/single_page/dashboard/system/migration/import.php
@@ -228,8 +228,11 @@ public function add_content_to_batch()
 
         $importer = \Core::make('migration/manager/importer/parser')->driver($this->request->request('format'));
 
-        if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
-            $this->error->add(t('Invalid XML file.'));
+        $uploadedFile = $this->request->files->get('file');
+        if ($uploadedFile === null) {
+            $this->error->add(t('File not uploaded'));
+        } elseif (!$uploadedFile->isValid()) {
+            $this->error->add($uploadedFile->getErrorMessage());
         } else {
             $importer->validateUploadedFile($_FILES['file'], $this->error);
         }