bug #1804081 [export] export on server does not obey AllowAnyWhereRecoding

ChangeLog

@@ -33,6 +33,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1826022 [privileges] unable to add user (MySQL 3.23) since PMA 2.11.2
 - bug #1823045 [import] Error importing file with lowercase "delimiter"
 - bug #1828913 [structure] Can't set FULLTEXT index on CHAR column
+- bug #1804081 [export] export on server doesn't obey AllowAnyWhereRecoding
 
 2.11.2.1 (not yet released)
 - fixed possible SQL injection using database name

export.php

@@ -169,6 +169,9 @@ function PMA_exportOutputHandler($line)
         }
     } else {
         if ($GLOBALS['asfile']) {
+            if ($GLOBALS['output_charset_conversion']) {
+                $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line);
+            }
             if ($GLOBALS['save_on_server'] && strlen($line) > 0) {
                 $write_result = @fwrite($GLOBALS['file_handle'], $line);
                 if (!$write_result || ($write_result != strlen($line))) {
@@ -183,9 +186,6 @@ function PMA_exportOutputHandler($line)
                 } // end if
             } else {
                 // We export as file - output normally
-                if ($GLOBALS['output_charset_conversion']) {
-                    $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line);
-                }
                 echo $line;
             }
         } else {