diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2010-04-22 13:34:13 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2010-04-22 13:34:13 +0200 |
commit | 47cd452c91a3dc7dab4a8285136bee2048fc7bba (patch) | |
tree | eea85b5399f4cab26ac5cca8847185bd9f322bc1 /system | |
parent | 60e78c75f9cb332dcd5a387bf4262c1566f32b8e (diff) |
Fixed Upload bug that would break when files and images were both included on an allowed filetype list in the wrong order: http://codeigniter.com/bug_tracker/bug/11552/
Diffstat (limited to 'system')
-rw-r--r-- | system/libraries/Upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 3131469de..0e71aee6b 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -578,7 +578,7 @@ class CI_Upload { $mime = $this->mimes_types(strtolower($val)); // Images get some additional checks - if (in_array($val, $image_types)) + if ($this->file_ext == '.' . $val && in_array($val, $image_types)) { if (getimagesize($this->file_temp) === FALSE) { |