Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-05-27 18:30:22 +02:00
commit 1baaf957fa

View File

@ -1332,8 +1332,8 @@ function PMA_stopImport( PMA_Message $error_message )
if ($file_to_unlink != '') {
unlink($file_to_unlink);
}
$_SESSION['Import_message']['message'] = $error_message->getDisplay();
$msg = $error_message->getDisplay();
$_SESSION['Import_message']['message'] = $msg;
$response = PMA_Response::getInstance();
$response->isSuccess(false);