Merge remote-tracking branch 'origin/master'

phpmyadmin · Nov 26, 2017 · 78ce32e · 78ce32e
2 parents b6a5b90 + ed396da
commit 78ce32e
Show file tree

Hide file tree

Showing 16 changed files with 420 additions and 573 deletions.
diff --git a/db_import.php b/db_import.php
@@ -38,7 +38,7 @@
 
 $response = Response::getInstance();
 $response->addHTML(
-    Import::getImportDisplay(
+    Import::get(
         'database', $db, $table, $max_upload_size
     )
 );