gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

Browse Source
This commit is contained in:
Weblate 2013-04-27 21:17:25 +02:00
commit 3790d46813
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

12
import.php
View File

@ -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'] . ')');
}
}
}
}