nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #3430291 [import] Handle conflicts in some open_basedir situations

Browse Source
This commit is contained in:
Gabor Gyorvari
2011-11-05 10:33:19 -04:00
committed by Marc Delisle
parent 8170d03d3c
commit 8721f7b160
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
- bug #3426836 [interface] Visual column separation - bug #3426836 [interface] Visual column separation
- bug #3428065 [parser] TRUE not recognized by parser - bug #3428065 [parser] TRUE not recognized by parser
+ patch #3433770 [config] Make location of php-gettext configurable + 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) 3.4.7.0 (2011-10-23)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false

2
import.php
View File

@@ -259,7 +259,7 @@ if ($import_file != 'none' && !$error) {
if (is_writable($tmp_subdir)) { 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)) { if (move_uploaded_file($import_file, $import_file_new)) {
$import_file = $import_file_new; $import_file = $import_file_new;
$file_to_unlink = $import_file_new; $file_to_unlink = $import_file_new;