The branch, master has been updated via 84f621b545e23ccc8645701c7a8d18380226332d (commit) via 14c332461cea55aae9642bb1ae7757800a9d6d96 (commit) via 786328c50b1387c31f02e698693d67ad7b11330a (commit) via 4e89311089f9d63db39ba619bab8d0a6f5623204 (commit) from 2e1d5ac20a6245d50fcf09f4ba90eb6b7197a360 (commit)

- Log ----------------------------------------------------------------- commit 84f621b545e23ccc8645701c7a8d18380226332d Author: Madhura Jayaratne madhura.cj@gmail.com Date: Wed Aug 24 22:52:28 2011 +0530

Sanitize filenames in a unified manner - more instances

commit 14c332461cea55aae9642bb1ae7757800a9d6d96 Merge: 2e1d5ac 786328c Author: Madhura Jayaratne madhura.cj@gmail.com Date: Wed Aug 24 22:50:37 2011 +0530

Merge branch 'QA_3_4'

Conflicts: export.php

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

Summary of changes: export.php | 4 +--- libraries/gis/pma_gis_visualization.php | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/export.php b/export.php index 5f91713..c5af244 100644 --- a/export.php +++ b/export.php @@ -274,9 +274,7 @@ if ($asfile) { } } $filename = PMA_expandUserString($filename_template); - - // convert filename to iso-8859-1, it is safer - $filename = PMA_convert_string('utf-8', '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 diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php index 29f2e1c..1c9ea58 100644 --- a/libraries/gis/pma_gis_visualization.php +++ b/libraries/gis/pma_gis_visualization.php @@ -104,8 +104,7 @@ class PMA_GIS_Visualization */ private function _sanitizeName($file_name, $ext) { - // convert filename to iso-8859-1, it is safer - $file_name = PMA_convert_string('utf-8', 'iso-8859-1', $file_name); + $file_name = PMA_sanitize_filename($file_name);

// Check if the user already added extension; // get the substring where the extension would be if it was included

hooks/post-receive