diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
| commit | 0a128bab0a788288c5291491a68bd1c9ab432825 (patch) | |
| tree | 29e9887258865343dc1a6e6322a3933cf6527c61 /modules/forge/libraries | |
| parent | 8e1ae7549362688dd38e053dd736ddc5fc6a4982 (diff) | |
| parent | 9369fd55a36183b7dc1e4b42af46a8f649a66578 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/forge/libraries')
| -rw-r--r-- | modules/forge/libraries/Form_Upload.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/forge/libraries/Form_Upload.php b/modules/forge/libraries/Form_Upload.php index da48764c..eda9c8a6 100644 --- a/modules/forge/libraries/Form_Upload.php +++ b/modules/forge/libraries/Form_Upload.php @@ -135,6 +135,10 @@ class Form_Upload_Core extends Form_Input { $mime = $this->upload['type']; } + // Get rid of the ";charset=binary" that can occasionally occur and is + // legal via RFC2045 + $mime = preg_replace('/; charset=binary/', '', $mime); + // Allow nothing by default $allow = FALSE; |