The branch, master has been updated via a7ea657625a7c4ddb1389d9cd9b1f82bf00bc80c (commit) via 8721f7b1601295186f4b9df5dee285911c8aaaf7 (commit) from 02d57998932e21bd4b8189e52aa9430089edbbcf (commit)
- Log ----------------------------------------------------------------- commit a7ea657625a7c4ddb1389d9cd9b1f82bf00bc80c Merge: 02d5799 8721f7b Author: Marc Delisle marc@infomarc.info Date: Sat Nov 5 10:33:45 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + import.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index b622fc9..d63bd32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,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 c6cec25..af829d9 100644 --- a/import.php +++ b/import.php @@ -272,7 +272,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
-
Marc Delisle