Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Gyorvari <scr34m-sf@users.sourceforge.net>2011-11-05 18:33:19 +0400
committerMarc Delisle <marc@infomarc.info>2011-11-05 18:33:19 +0400
commit8721f7b1601295186f4b9df5dee285911c8aaaf7 (patch)
tree36a8032a8a4bc9c45f4aa37ab1f8f0ac8258eb8d /import.php
parent8170d03d3cd4892f71db9b89cdf442006bcc1167 (diff)
patch #3430291 [import] Handle conflicts in some open_basedir situations
Diffstat (limited to 'import.php')
-rw-r--r--import.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/import.php b/import.php
index d706b60552..07e5d18038 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;