[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4RC1-40-g786328c

[Madhura Jayaratne]

The branch, QA_3_4 has been updated
       via  786328c50b1387c31f02e698693d67ad7b11330a (commit)
      from  4e89311089f9d63db39ba619bab8d0a6f5623204 (commit)


- Log -----------------------------------------------------------------
commit 786328c50b1387c31f02e698693d67ad7b11330a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Wed Aug 24 22:44:38 2011 +0530

    Sanitize filenames (in a unified manner) before using in Content-Disposition header

-----------------------------------------------------------------------

Summary of changes:
 export.php |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/export.php b/export.php
index 100269f..fb8805a 100644
--- a/export.php
+++ b/export.php
@@ -271,9 +271,7 @@ if ($asfile) {
         }
     }
     $filename = PMA_expandUserString($filename_template);
-
-    // convert filename to iso-8859-1, it is safer
-    $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
+    $filename = PMA_sanitize_filename($filename);
 
     // Grab basic dump extension and mime type
     // Check if the user already added extension; get the substring where the extension would be if it was included


hooks/post-receive
-- 
phpMyAdmin