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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-08 12:57:10 +05:30
commit 60c5e7316e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
- bug #4593 Manual "SELECT" doesn't change active table
- bug #4623 Incomplete PHP OpenSSL support
- bug #4626 Ctrl + click on a column not in sort triggers a server call to erroneous url
- bug #4625 "Insufficient space to save the file" on export SQL to file on server
4.3.0.0 (2014-12-05)
+ rfe #1502 Smart sorting for int keys

6
libraries/export.lib.php
View File

@ -111,7 +111,7 @@ function PMA_exportOutputHandler($line)
}
if ($GLOBALS['save_on_server']) {
$write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer);
if ($write_result != /*overload*/mb_strlen($dump_buffer)) {
if ($write_result != strlen($dump_buffer)) {
$GLOBALS['message'] = PMA_Message::error(
__('Insufficient space to save the file %s.')
);
@ -143,7 +143,7 @@ function PMA_exportOutputHandler($line)
if ($GLOBALS['save_on_server'] && /*overload*/mb_strlen($line) > 0) {
$write_result = @fwrite($GLOBALS['file_handle'], $line);
if (! $write_result
|| $write_result != /*overload*/mb_strlen($line)
|| $write_result != strlen($line)
) {
$GLOBALS['message'] = PMA_Message::error(
__('Insufficient space to save the file %s.')
@ -365,7 +365,7 @@ function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle);
if (/*overload*/mb_strlen($dump_buffer) > 0
&& (! $write_result || $write_result != /*overload*/mb_strlen($dump_buffer))
&& (! $write_result || $write_result != strlen($dump_buffer))
) {
$message = new PMA_Message(
__('Insufficient space to save the file %s.'),