Separate data decoding from output

1 files changed, 10 insertions, 6 deletions

diff --git a/file_echo.php b/file_echo.php
index 2add078633..2756209252 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -39,16 +39,20 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
         $filename = $_REQUEST['filename'];
     }
 
-    /* Send download header */
-    PMA_download_header($filename, $_REQUEST['type']);
-
-    /* Send data */
+    /* Decode data */
     if ($extension != 'svg') {
-        echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1));
+        $data = substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1);
+        $data = base64_decode($data);
     } else {
-        echo $_REQUEST['image'];
+        $data = $_REQUEST['image'];
     }
 
+    /* Send download header */
+    PMA_download_header($filename, $_REQUEST['type'], strlen($data));
+
+    /* Send data */
+    echo $data;
+
 } else if (isset($_REQUEST['monitorconfig'])) {
     PMA_download_header('monitor.cfg', 'application/force-download');
     echo urldecode($_REQUEST['monitorconfig']);