Merge remote-tracking branch 'origin/master'

2015-08-10 14:42:41 +02:00 · 2015-08-10 14:42:41 +02:00 · b29dc104bf
commit b29dc104bf
parent f7d0f9ac34 a6fedd3415
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -90,6 +90,7 @@ phpMyAdmin - ChangeLog

 4.4.14.0 (not yet released)
 - issue #11367 Export after search, missing WHERE clause
+- issue #11380 Incomplete message after import

 4.4.13.1 (2015-08-08)
 - issue #11368 SQL error when importing phpMyAdmin dump file
--- a/import.php
+++ b/import.php
@ -690,7 +690,7 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
        if ($import_notice) {
            $message->addString($import_notice);
        }
-        if (isset($local_import_file)) {
+        if (! empty($local_import_file)) {
            $message->addString('(' . htmlspecialchars($local_import_file) . ')');
        } else {
            $message->addString(