diff options
| author | Michal Čihař <michal@cihar.com> | 2016-03-08 16:26:49 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-03-08 16:26:49 +0300 |
| commit | 28d15ebb8c20414fbdc69c9c82e9e45769a9694a (patch) | |
| tree | 64ffc9a1f049049c97d52f738a74217c93b41c54 /export.php | |
| parent | 5bd9fc4e4007c7a080b534802c29c088630bf372 (diff) | |
Add method for checking if encoding conversion is supported
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'export.php')
| -rw-r--r-- | export.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/export.php b/export.php index c1af17ba4e..c28912d40f 100644 --- a/export.php +++ b/export.php @@ -330,7 +330,7 @@ if (!defined('TESTSUITE')) { // Do we need to convert charset? $output_charset_conversion = $asfile - && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE + && Encoding::isSupported() && isset($charset) && $charset != 'utf-8' && $type != 'xls'; |