Merge branch 'QA_4_4'

phpmyadmin · Aug 10, 2015 · a6fedd3 · a6fedd3
2 parents 9fb5d83 + c080382
commit a6fedd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -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

diff --git a/import.php b/import.php
@@ -690,7 +690,7 @@
         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(