[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-14-g8721f7b

The branch, QA_3_4 has been updated via 8721f7b1601295186f4b9df5dee285911c8aaaf7 (commit) from 8170d03d3cd4892f71db9b89cdf442006bcc1167 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + import.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87877da..f89acb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #3426836 [interface] Visual column separation - bug #3428065 [parser] TRUE not recognized by parser + patch #3433770 [config] Make location of php-gettext configurable +- patch #3430291 [import] Handle conflicts in some open_basedir situations 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/import.php b/import.php index d706b60..07e5d18 100644 --- a/import.php +++ b/import.php @@ -259,7 +259,7 @@ if ($import_file != 'none' && !$error) { if (is_writable($tmp_subdir)) { - $import_file_new = $tmp_subdir . basename($import_file); + $import_file_new = $tmp_subdir . basename($import_file) . uniqid(); if (move_uploaded_file($import_file, $import_file_new)) { $import_file = $import_file_new; $file_to_unlink = $import_file_new; hooks/post-receive -- phpMyAdmin