diff options
| author | Isaac Bennetch <bennetch@gmail.com> | 2017-01-18 05:41:26 +0300 |
|---|---|---|
| committer | Isaac Bennetch <bennetch@gmail.com> | 2017-01-18 06:01:45 +0300 |
| commit | 583e5e660a6d3b6dd12521e1135eefc2edbb766c (patch) | |
| tree | 84f365fdb37bceef25607bd8fb3095980caae281 /export.php | |
| parent | 179a86b2d38daab725445c648f5c180063165d9b (diff) | |
Remove dead code and strings relating to xls/xlsx import and export.
This code was removed in 3.4.5.0 but some strings and tests remained.
Fixes #12742
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Diffstat (limited to 'export.php')
| -rw-r--r-- | export.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/export.php b/export.php index 091d41ad96..d1317ff565 100644 --- a/export.php +++ b/export.php @@ -186,9 +186,6 @@ $export_plugin = PMA_getPlugin( ) ); -// Backward compatibility -$type = $what; - // Check export type if (empty($export_plugin)) { PMA_fatalError(__('Bad type!')); @@ -318,13 +315,12 @@ if ($what == 'sql') { $crlf = PMA\libraries\Util::whichCrlf(); } -$output_kanji_conversion = Encoding::canConvertKanji() && $type != 'xls'; +$output_kanji_conversion = Encoding::canConvertKanji(); // Do we need to convert charset? $output_charset_conversion = $asfile && Encoding::isSupported() - && isset($charset) && $charset != 'utf-8' - && $type != 'xls'; + && isset($charset) && $charset != 'utf-8'; // Use on the fly compression? $GLOBALS['onfly_compression'] = $GLOBALS['cfg']['CompressOnFly'] |