diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-14 09:41:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-14 09:41:30 +0200 |
| commit | 3375a681eb4bc4aa6e64d9a423ba0d1b6b0f4e12 (patch) | |
| tree | fd092ff52c28d0213b3f7d422a3e7768ca39d37a /program/steps/mail/func.inc | |
| parent | ed837a3544b8c157b00f520e0c716304abedd519 (diff) | |
Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 7e763a2d8..fc22366c0 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1823,8 +1823,7 @@ function rcmail_fix_mimetype($name) // application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608 if (preg_match('/^application\/pdf.+/', $name)) $name = 'application/pdf'; - - // treat image/pjpeg as image/jpeg + // treat image/pjpeg (image/pjpg, image/jpg) as image/jpeg (#1489097) else if (preg_match('/^image\/p?jpe?g$/', $name)) $name = 'image/jpeg'; |