diff --git a/ChangeLog b/ChangeLog index a5df78010c..1b2c9e7566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3879 Import broken for CSV using LOAD DATA - bug #3889 When login fails and error display is active, login data is displayed - bug #3890 [import] Web server upload directory import fails +- bug #3891 [import] Server upload folder import file name missing in success message 4.0.0.0 (not yet released) + Patch #3481047 for rfe #3480477 Insert as new row enhancement 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'] . ')'); + } } } }