Merge branch 'QA_4_7'

linaspasv · Mar 21, 2017 · aefe197 · aefe197
2 parents 7adff6b + 297aec9
commit aefe197
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -114,6 +114,7 @@ phpMyAdmin - ChangeLog
 - issue #13092 Do not try to sync favorite tables if configuration storage is not enabled
 - issue #13105 Fixed changing attribute for virtual field
 - issue #12757 Fixed setting password on recent MariaDB with non working plugins
+- issue #12349 Fixed undefined variable on import from some formats
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

diff --git a/import.php b/import.php
@@ -330,6 +330,8 @@
 $charset_conversion = false;
 $reset_charset = false;
 $bookmark_created = false;
+$result = false;
+$msg = 'Sorry an unexpected error happened!';
 
 // Bookmark Support: get a query back from bookmark if required
 if (! empty($_REQUEST['id_bookmark'])) {