Merge remote-tracking branch 'origin/master'

db_operations.php

@@ -134,6 +134,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
         $tables_full = PMA_DBI_get_tables_full($db);
         $views = array();
 
+        require_once "libraries/plugin_interface.lib.php";
         // remove all foreign key constraints, otherwise we can get errors
         $export_sql_plugin = PMA_getPlugin(
             "export",

libraries/display_import_ajax.lib.php

@@ -121,6 +121,6 @@ function PMA_import_nopluginCheck()
 function PMA_importAjaxStatus($id)
 {
     header('Content-type: application/json');
-    echo json_encode(PMA_getUploadStatus($id));
+    echo json_encode($_SESSION[$SESSION_KEY]["handler"]::getUploadStatus($id));
 }
 ?>