Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-10-05 08:02:30 +02:00
commit c4a2e1b6f2

View File

@ -62,9 +62,9 @@ if (isset($_POST['submit_export'])
$tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
if (@is_writable($tmp_subdir)) {
$import_file_new = tempnam($tmp_subdir, 'prefs');
$file_to_unlink = $import_file_new;
if (move_uploaded_file($import_file, $import_file_new)) {
$import_file = $import_file_new;
$file_to_unlink = $import_file_new;
}
}
}