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 20:44:01 +05:30
commit 67756cc3f9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/export.lib.php
View File

@ -111,6 +111,8 @@ function PMA_exportOutputHandler($line)
}
if ($GLOBALS['save_on_server']) {
$write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer);
// Here, use strlen rather than mb_strlen to get the length
// in bytes to compare against the number of bytes written.
if ($write_result != strlen($dump_buffer)) {
$GLOBALS['message'] = PMA_Message::error(
__('Insufficient space to save the file %s.')
@ -142,6 +144,8 @@ function PMA_exportOutputHandler($line)
}
if ($GLOBALS['save_on_server'] && /*overload*/mb_strlen($line) > 0) {
$write_result = @fwrite($GLOBALS['file_handle'], $line);
// Here, use strlen rather than mb_strlen to get the length
// in bytes to compare against the number of bytes written.
if (! $write_result
|| $write_result != strlen($line)
) {
@ -364,6 +368,8 @@ function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
{
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle);
// Here, use strlen rather than mb_strlen to get the length
// in bytes to compare against the number of bytes written.
if (/*overload*/mb_strlen($dump_buffer) > 0
&& (! $write_result || $write_result != strlen($dump_buffer))
) {