Merge pull request #5731 from BookStackApp/lexical_jul25

[bookstack] / app / Exports / Controllers / ImportController.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index d8dceed2f8e83aea554edc55ea926e56ad5af331..b938dac8e29191b045eab9e8022afcf1018da678 100644 (file)
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -70,9 +70,11 @@ class ImportController extends Controller
         ]);
     }
 
+    /**
+     * Run the import process against an uploaded import ZIP.
+     */
     public function run(int $id, Request $request)
     {
-        // TODO - Test access/visibility
         $import = $this->imports->findVisible($id);
         $parent = null;
 
@@ -87,6 +89,8 @@ class ImportController extends Controller
         try {
             $entity = $this->imports->runImport($import, $parent);
         } catch (ZipImportException $exception) {
+            session()->flush();
+            $this->showErrorNotification(trans('errors.import_zip_failed_notification'));
             return redirect($import->getUrl())->with('import_errors', $exception->errors);
         }