From 0727efa165770cbc9a57db36c412647173ac62d2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 9 Aug 2005 12:09:46 +0000
Subject: [PATCH] add unique numbers to $strFileCouldNotBeRead to improve
 support when someone gets this error

---
 ChangeLog     | 4 ++++
 read_dump.php | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 053b311ad..92f724708 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $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>
     * libraries/export/htmlword.php: Fix undefined variable when exporting
       relations (bug #1253457).
diff --git a/read_dump.php b/read_dump.php
index 96b7c7a99..6e743b697 100644
--- a/read_dump.php
+++ b/read_dump.php
@@ -99,21 +99,21 @@ if ($sql_file != 'none') {
             if (!is_writeable($tmp_subdir)) {
                 $sql_query = PMA_readFile($sql_file, $sql_file_compression);
                 if ($sql_query == FALSE) {
-                    $message = $strFileCouldNotBeRead;
+                    $message = $strFileCouldNotBeRead . ' (1)';
                 }
             } else {
                 $sql_file_new = $tmp_subdir . basename($sql_file);
                 if (move_uploaded_file($sql_file, $sql_file_new)) {
                     $sql_query = PMA_readFile($sql_file_new, $sql_file_compression);
                     if ($sql_query == FALSE) {
-                        $message = $strFileCouldNotBeRead;
+                        $message = $strFileCouldNotBeRead . ' (2)';
                     }
                     unlink($sql_file_new);
                 } else {
                     // Moving uploaded file failed. Falling back to try reading it immediately.
                     $sql_query = PMA_readFile($sql_file, $sql_file_compression);
                     if ($sql_query == FALSE) {
-                        $message = $strFileCouldNotBeRead;
+                        $message = $strFileCouldNotBeRead . ' (3)';
                     }
                 }
             }
@@ -121,7 +121,7 @@ if ($sql_file != 'none') {
             // read from the normal upload dir
             $sql_query = PMA_readFile($sql_file, $sql_file_compression);
             if ($sql_query == FALSE) {
-                $message = $strFileCouldNotBeRead;
+                $message = $strFileCouldNotBeRead . ' (4)';
             }
         }