Merge branch 'refs/heads/master' into demo

daylightstudio · Mar 6, 2012 · 0055511 · 0055511
2 parents 869250c + b67aa65
commit 0055511
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fuel/modules/fuel/controllers/module.php b/fuel/modules/fuel/controllers/module.php
@@ -1440,7 +1440,7 @@ protected function _process_uploads($posted = NULL)
 
 						//$config['xss_clean'] = TRUE; // causes problem with image if true... so we use the below method
 						$tmp_file = file_get_contents($file_info['tmp_name']);
-						if ($this->sanitize_images AND xss_clean($tmp_file, TRUE) === FALSE)
+						if ($this->sanitize_images AND is_image_file($config['file_name']) AND xss_clean($tmp_file, TRUE) === FALSE)
 						{
 							$errors = TRUE;
 							add_error(lang('upload_invalid_filetype'));