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

no longer useful since all lang files are UTF-8

Browse Source
This commit is contained in:
Marc Delisle
2008-10-01 20:48:40 +00:00
parent df7a74523f
commit 6208585d04
61 changed files with 9 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
export.php
View File

@@ -206,8 +206,7 @@ if ($what == 'sql') {
$output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xls';
// Do we need to convert charset?
$output_charset_conversion = $asfile &&
$cfg['AllowAnywhereRecoding'] && $allow_recoding
$output_charset_conversion = $asfile && $cfg['AllowAnywhereRecoding']
&& isset($charset_of_file) && $charset_of_file != $charset
&& $type != 'xls';
@@ -262,7 +261,7 @@ if ($asfile) {
}
// convert filename to iso-8859-1, it is safer
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )) {
$filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
} else {
$filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);