Fix bug #3891 Server upload folder import file name missing in success message

1 files changed, 10 insertions, 2 deletions

diff --git a/import.php b/import.php
index 3f8fed9ba1..1de72fe5b4 100644
--- a/import.php
+++ b/import.php
@@ -529,13 +529,21 @@ if (! empty($id_bookmark) && $action_bookmark == 2) {
             $message->addParam($executed_queries);
 
             $message->addString($import_notice);
-            $message->addString('(' . $_FILES['import_file']['name'] . ')');
+            if (isset($local_import_file)) {
+                $message->addString('(' . $local_import_file . ')');
+            } else {
+                $message->addString('(' . $_FILES['import_file']['name'] . ')');
+            }
         } else {
             $message = PMA_Message::success(
                 __('Import has been successfully finished, %d queries executed.')
             );
             $message->addParam($executed_queries);
-            $message->addString('(' . $_FILES['import_file']['name'] . ')');
+            if (isset($local_import_file)) {
+                $message->addString('(' . $local_import_file . ')');
+            } else {
+                $message->addString('(' . $_FILES['import_file']['name'] . ')');
+            }
         }
     }
 }