From 6d7b874ef1382ad645b5f03e8da90fd692bc8d02 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Fri, 13 Jun 2014 08:16:47 +0000 Subject: [PATCH] Fix case issue impacting server save of SVG files (usually not used by modern browsers given the checks) git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2883 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/extensions/allowedMimeTypes.php | 2 +- editor/extensions/filesave.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/extensions/allowedMimeTypes.php b/editor/extensions/allowedMimeTypes.php index 1e932b84..28467c9c 100644 --- a/editor/extensions/allowedMimeTypes.php +++ b/editor/extensions/allowedMimeTypes.php @@ -1,7 +1,7 @@ 'image/svg+xml;charset=utf-8', + 'svg' => 'image/svg+xml;charset=UTF-8', 'png' => 'image/png', 'jpeg' => 'image/jpeg', 'bmp' => 'image/bmp', diff --git a/editor/extensions/filesave.php b/editor/extensions/filesave.php index 84d7300a..9828ad6f 100644 --- a/editor/extensions/filesave.php +++ b/editor/extensions/filesave.php @@ -20,8 +20,8 @@ function encodeRFC5987ValueChars ($str) { require('allowedMimeTypes.php'); -$mime = !isset($_POST['mime']) || !in_array($_POST['mime'], $allowedMimeTypesBySuffix) ? 'image/svg+xml;charset=UTF-8' : $_POST['mime']; - +$mime = (!isset($_POST['mime']) || !in_array($_POST['mime'], $allowedMimeTypesBySuffix)) ? 'image/svg+xml;charset=UTF-8' : $_POST['mime']; + if (!isset($_POST['output_svg']) && !isset($_POST['output_img'])) { die('post fail'); }