Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'QA_3_4'

  • Loading branch information...
commit a7ea657625a7c4ddb1389d9cd9b1f82bf00bc80c 2 parents 02d5799 + 8721f7b
@lem9 lem9 authored
Showing with 2 additions and 1 deletion.
  1. +1 −0  ChangeLog
  2. +1 −1  import.php
View
1  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
View
2  import.php
@@ -272,7 +272,7 @@
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;
Please sign in to comment.
Something went wrong with that request. Please try again.