address concretecms#83: show informative error msg when adding conten…

…t to batch
shahroq · Jan 30, 2020 · bcf9504 · bcf9504
1 parent c108e45
commit bcf9504
Showing 1 changed file with 11 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,17 @@ 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 = new \Symfony\Component\HttpFoundation\File\UploadedFile(
+            $_FILES['file']['tmp_name'],
+            $_FILES['file']['name'],
+            $_FILES['file']['type'],
+            $_FILES['file']['size'],
+            $_FILES['file']['error'],
+            true
+        );
+
+        if (!$UploadedFile->isValid()) {
+            $this->error->add($UploadedFile->getErrorMessage());
         } else {
             $importer->validateUploadedFile($_FILES['file'], $this->error);
         }