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

bug #1804081 [export] export on server does not obey AllowAnyWhereRecoding

Browse Source
This commit is contained in:
Marc Delisle
2007-11-10 15:20:59 +00:00
parent e804c18084
commit aa0a464f10
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
export.php
View File

@@ -169,6 +169,9 @@ function PMA_exportOutputHandler($line)
}
} else {
if ($GLOBALS['asfile']) {
if ($GLOBALS['output_charset_conversion']) {
$line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line);
}
if ($GLOBALS['save_on_server'] && strlen($line) > 0) {
$write_result = @fwrite($GLOBALS['file_handle'], $line);
if (!$write_result || ($write_result != strlen($line))) {
@@ -183,9 +186,6 @@ function PMA_exportOutputHandler($line)
} // end if
} else {
// We export as file - output normally
if ($GLOBALS['output_charset_conversion']) {
$line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line);
}
echo $line;
}
} else {