bug #925913 - file upload

1 files changed, 14 insertions, 9 deletions

diff --git a/read_dump.php b/read_dump.php
index 2f418ce0ae..0ab7763cd6 100644
--- a/read_dump.php
+++ b/read_dump.php
@@ -96,18 +96,23 @@ if ($sql_file != 'none') {
                 if ($sql_query == FALSE) {
                     $message = $strFileCouldNotBeRead;
                 }
-            }
-            else {
+            } else {
                 $sql_file_new = $tmp_subdir . basename($sql_file);
-                move_uploaded_file($sql_file, $sql_file_new);
-                $sql_query = PMA_readFile($sql_file_new, $sql_file_compression);
-                if ($sql_query == FALSE) {
-                    $message = $strFileCouldNotBeRead;
+                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;
+                    }
+                    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;
+                    }
                 }
-                unlink($sql_file_new);
             }
-        }
-        else {
+        } else {
             // read from the normal upload dir
             $sql_query = PMA_readFile($sql_file, $sql_file_compression);
             if ($sql_query == FALSE) {