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

add unique numbers to $strFileCouldNotBeRead to improve support when someone gets this error

Browse Source
This commit is contained in:
Marc Delisle
2005-08-09 12:09:46 +00:00
parent 1e054e1fe7
commit 0727efa165
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-08-09 Marc Delisle <lem9@users.sourceforge.net>
* read_dump.php: add unique numbers to $strFileCouldNotBeRead to
improve support when someone gets this error
2005-08-08 Michal Čihař <michal@cihar.com> 2005-08-08 Michal Čihař <michal@cihar.com>
* libraries/export/htmlword.php: Fix undefined variable when exporting * libraries/export/htmlword.php: Fix undefined variable when exporting
relations (bug #1253457). relations (bug #1253457).

8
read_dump.php
View File

@@ -99,21 +99,21 @@ if ($sql_file != 'none') {
if (!is_writeable($tmp_subdir)) { if (!is_writeable($tmp_subdir)) {
$sql_query = PMA_readFile($sql_file, $sql_file_compression); $sql_query = PMA_readFile($sql_file, $sql_file_compression);
if ($sql_query == FALSE) { if ($sql_query == FALSE) {
$message = $strFileCouldNotBeRead; $message = $strFileCouldNotBeRead . ' (1)';
} }
} else { } else {
$sql_file_new = $tmp_subdir . basename($sql_file); $sql_file_new = $tmp_subdir . basename($sql_file);
if (move_uploaded_file($sql_file, $sql_file_new)) { if (move_uploaded_file($sql_file, $sql_file_new)) {
$sql_query = PMA_readFile($sql_file_new, $sql_file_compression); $sql_query = PMA_readFile($sql_file_new, $sql_file_compression);
if ($sql_query == FALSE) { if ($sql_query == FALSE) {
$message = $strFileCouldNotBeRead; $message = $strFileCouldNotBeRead . ' (2)';
} }
unlink($sql_file_new); unlink($sql_file_new);
} else { } else {
// Moving uploaded file failed. Falling back to try reading it immediately. // Moving uploaded file failed. Falling back to try reading it immediately.
$sql_query = PMA_readFile($sql_file, $sql_file_compression); $sql_query = PMA_readFile($sql_file, $sql_file_compression);
if ($sql_query == FALSE) { if ($sql_query == FALSE) {
$message = $strFileCouldNotBeRead; $message = $strFileCouldNotBeRead . ' (3)';
} }
} }
} }
@@ -121,7 +121,7 @@ if ($sql_file != 'none') {
// read from the normal upload dir // read from the normal upload dir
$sql_query = PMA_readFile($sql_file, $sql_file_compression); $sql_query = PMA_readFile($sql_file, $sql_file_compression);
if ($sql_query == FALSE) { if ($sql_query == FALSE) {
$message = $strFileCouldNotBeRead; $message = $strFileCouldNotBeRead . ' (4)';
} }
} }