From 40edb83b3cdc1d018bda9215fad7009362c456d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 12 Feb 2016 11:52:03 +0100 Subject: [PATCH] Correctly store and report file upload errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #11946 Signed-off-by: Michal Čihař --- ChangeLog | 1 + tbl_replace.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e69ec29bf..566c546e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog - issue #11939 Correct content type for uploaded error reports - issue #11940 Silent errors from checking local documentation - issue #11944 Fixed error on servers with disabled php_uname +- issue #11946 Correctly store and report file upload errors 4.5.4.1 (2016-01-29) - issue #11892 Error with PMA 4.4.15.3 diff --git a/tbl_replace.php b/tbl_replace.php index a81f9ccb02..217652ffc7 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -247,7 +247,7 @@ foreach ($loop_array as $rownumber => $where_clause) { } if ($file_to_insert->isError()) { - $message .= $file_to_insert->getError(); + $insert_errors[] = $file_to_insert->getError(); } // delete $file_to_insert temporary variable $file_to_insert->cleanUp();