diff options
| author | Michal Čihař <mcihar@novell.com> | 2011-06-03 16:02:02 +0400 |
|---|---|---|
| committer | Michal Čihař <mcihar@novell.com> | 2011-06-03 16:04:29 +0400 |
| commit | bbbf2c49ed922c73f24b8e9c9c01c0721893cd07 (patch) | |
| tree | 4a7fdbb99cd6f195fadcc2f3103ddf3698af1479 /export.php | |
| parent | 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 (diff) | |
Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
Diffstat (limited to 'export.php')
| -rw-r--r-- | export.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/export.php b/export.php index 22a6324261..1a60151dc4 100644 --- a/export.php +++ b/export.php @@ -147,7 +147,7 @@ function PMA_exportOutputHandler($line) if ($dump_buffer_len > $GLOBALS['memory_limit']) { if ($GLOBALS['output_charset_conversion']) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // as bzipped if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) { @@ -181,7 +181,7 @@ function PMA_exportOutputHandler($line) } else { if ($GLOBALS['asfile']) { if ($GLOBALS['output_charset_conversion']) { - $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line); + $line = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $line); } if ($GLOBALS['save_on_server'] && strlen($line) > 0) { $write_result = @fwrite($GLOBALS['file_handle'], $line); @@ -637,7 +637,7 @@ if ($save_on_server && isset($message)) { if (!empty($asfile)) { // Convert the charset if required. if ($output_charset_conversion) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // Do the compression |