diff --git a/export.php b/export.php index 7caff0d3d..666cbd068 100644 --- a/export.php +++ b/export.php @@ -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); diff --git a/import.php b/import.php index c4cf61273..129c60741 100644 --- a/import.php +++ b/import.php @@ -316,8 +316,7 @@ if ($import_file != 'none' && !$error) { } // Convert the file's charset if necessary -if ($cfg['AllowAnywhereRecoding'] && $allow_recoding - && isset($charset_of_file)) { +if ($cfg['AllowAnywhereRecoding'] && isset($charset_of_file)) { if ($charset_of_file != $charset) { $charset_conversion = TRUE; } diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 5a55bfe5a..defb0c661 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -9,7 +9,6 @@ Laat weet my asb. as jy aan beter taalgebruik kan dink. */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index c519c91ab..29e48925f 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index b8084fafd..e9a197d77 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 590d17efe..5d25ad57f 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -5,7 +5,6 @@ // Şehriyar İmanov 30 Avqust 2003... Shehi $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 0a11c7bf5..cb5e8d402 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 83d67a3b1..660b425c3 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index f52e375dd..5c827b894 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -8,8 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 9699d5992..1e1f9f872 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -8,8 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 668f04380..301a6d69a 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 5be9120a7..1b600886e 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -3,7 +3,6 @@ /* translated by: Airon Luis Pereira */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' da esquerda para direita, 'rtl' da direita para esquerda) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 1a72dfdde..eec0e4442 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 0458f8328..54007db56 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' d'esquerra a dreta, 'rtl' de dreta a esquerra) $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 97f010b8f..6421c53b0 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index d58bdb652..ec5984607 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 578f50ec1..9714c6233 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index f27584aac..dd00299c8 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = '.'; diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index f2ae451dc..146b94ad0 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 7bfe6005e..e46394f5e 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 680b5ba7e..6ebe3597f 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 5000c9dcc..4d5c63cb8 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -9,7 +9,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index dc969c39b..705bc3bc2 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 4f2982665..c357c439a 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 8052712f4..ef320c88b 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 497fe3bd7..b1308f291 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -10,7 +10,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 72b1bac4c..e1c01c9af 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -12,7 +12,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 85d31d636..c54050ebf 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -4,7 +4,6 @@ /* Translated by Kyriakos Xagoraris */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 46649f8fc..21b59a9a6 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -3,7 +3,6 @@ * Translated by Hadar Porat */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index de5251dfd..f270b5148 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -9,7 +9,6 @@ // 5th updates : by Girish Nair : 25-Nov-2003 $charset = 'utf-8'; -$allow_recoding = FALSE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 90ac22d18..554707668 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -5,7 +5,6 @@ // József Tamás Herczeg $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr': balról jobbra, 'rtl': jobbról balra) $number_thousands_separator = ' '; $number_decimal_separator = '.'; diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 90ba11989..24f0ca8eb 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index eaa799098..cba6e512d 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 049487f97..036a9a34e 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -4,7 +4,6 @@ /* Translated by WooSuhan */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 2a6aa2579..69ea32613 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ' '; $number_decimal_separator = '.'; diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index c2ac648b2..3a9d6d65f 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index ef4d51822..82e415747 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -7,7 +7,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 224671a83..2ef3cb606 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -22,7 +22,6 @@ redkod - r3dkod@yahoo.com */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 4414c862c..cba94ecba 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index e7ae21f91..349a314ee 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 0ccee791f..dbfb5cd3c 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -7,7 +7,6 @@ www.BornisGroup.com info@BornisGroup.com */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 91ff8bdf8..ac4258363 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 07ee4e05c..dc1bded59 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 6bf220c55..855ebdbff 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 7543b0749..e2543ed74 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -9,7 +9,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 3b3cbc477..412df64b5 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index ac2d148b6..64321aee6 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -8,7 +8,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 92533bca8..6a33caa70 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -4,7 +4,6 @@ // by malindahs $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index af332c6fa..aa639963c 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -6,7 +6,6 @@ and Tomas Tatransky */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index d8bf100c4..e09a9f022 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -4,7 +4,6 @@ /* By: urska.colner, agenda d.o.o. , uros kositer, agenda d.o.o. */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = '.'; $number_decimal_separator = ','; diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index fda2393bc..83d8febe3 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index a69abccf0..048be8b0a 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -6,7 +6,6 @@ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ' '; $number_decimal_separator = ','; diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 8d38b0a5e..36ac643e3 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -2,8 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 4fe4b28b1..a1f4e4887 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -5,7 +5,6 @@ // last modified 2004/08/22 Arthit Suriyawongkul $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 0eaeee7cd..dce89c97d 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -8,7 +8,6 @@ // Çeviri sürümü phpMyAdmin 2.10.1.0 $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index ba303b5df..225a03fd8 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -2,7 +2,6 @@ /* $Id$ */ $charset = 'utf-8'; -$allow_recoding = TRUE; $text_dir = 'ltr'; $number_thousands_separator = ','; $number_decimal_separator = '.'; diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 74bc8b98f..5dc011872 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -13,8 +13,7 @@ if (! defined('PHPMYADMIN')) { * Loads the recode or iconv extensions if any of it is not loaded yet */ if (isset($cfg['AllowAnywhereRecoding']) - && $cfg['AllowAnywhereRecoding'] - && $allow_recoding) { + && $cfg['AllowAnywhereRecoding']) { if ($cfg['RecodingEngine'] == 'recode') { if (!@extension_loaded('recode')) { @@ -52,8 +51,7 @@ if (!isset($cfg['IconvExtraParams'])) { // Finally detect which function we will use: if (isset($cfg['AllowAnywhereRecoding']) - && $cfg['AllowAnywhereRecoding'] - && $allow_recoding) { + && $cfg['AllowAnywhereRecoding']) { if (!isset($PMA_recoding_engine)) { $PMA_recoding_engine = $cfg['RecodingEngine']; @@ -134,9 +132,9 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { * @author nijel */ function PMA_convert_charset($what) { - global $cfg, $allow_recoding, $charset, $convcharset; + global $cfg, $charset, $convcharset; - if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) + if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] ) || $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything... return $what; } else { diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ed063464c..0d7956df8 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -203,7 +203,7 @@ echo PMA_pluginGetJavascript($export_list);
' . $strCharsetOfFile . '' . "\n"; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 0f3aa841e..69d4194f2 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -82,7 +82,7 @@ if (!empty($cfg['UploadDir'])) { // charset of file echo '
' . "\n"; -if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) { +if ($cfg['AllowAnywhereRecoding']) { echo ''; reset($cfg['AvailableCharsets']); echo '