Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-02 12:14:55 +02:00
commit 16c8178544

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);