Merge remote-tracking branch 'origin/master'

2013-11-10 18:02:04 +01:00 · 2013-11-10 18:02:04 +01:00 · 90cc7f0dd6
commit 90cc7f0dd6
parent 9824b0dcd5 064944a0b0
1 changed files with 1 additions and 1 deletions
--- a/export.php
+++ b/export.php
@ -399,7 +399,7 @@ if (!defined('TESTSUITE')) {
    }

    $output_kanji_conversion = function_exists('PMA_Kanji_strConv')
-    && $type != 'xls';
+        && $type != 'xls';

    // Do we need to convert charset?
    $output_charset_conversion = $asfile