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

Merge branch 'QA_4_5' into QA_4_6

Browse Source
This commit is contained in:
Michal Čihař 2016-02-12 11:52:49 +01:00
commit 5636189d56
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -66,6 +66,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

2
tbl_replace.php
View File

@ -244,7 +244,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();