Merge pull request #11341 from udan11/fix_11340

Fix #11340.
This commit is contained in:
Marc Delisle 2015-08-02 06:14:46 -04:00
commit 68569bd4f3

View File

@ -638,7 +638,7 @@ if (! $error) {
// Do the real import
try {
$default_fk_check = PMA_Util::handleDisableFKCheckInit();
$import_plugin->doImport();
$import_plugin->doImport($sql_data);
PMA_Util::handleDisableFKCheckCleanup($default_fk_check);
} catch (Exception $e) {
PMA_Util::handleDisableFKCheckCleanup($default_fk_check);