summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-12-13 10:01:06 +0100
committerAndrey Andreev <narf@bofh.bg>2011-12-13 10:01:06 +0100
commitf7aed129051475b4baeeb549a764464560c9dd34 (patch)
treed735ddf4b771a948058b460becf4d399794097d6 /system/libraries
parent3b6ff4ddc5ca433ba7b68a51a617c00b93511889 (diff)
Tweak MIME regular expression check again
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index c72fa3c6d..91fbf66ca 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1019,7 +1019,7 @@ class CI_Upload {
protected function _file_mime_type($file)
{
// We'll need this to validate the MIME info string (e.g. text/plain; charset=us-ascii)
- $regexp = '/^([a-z\-]+\/[a-z0-9\-\.\+]+);\s.+$/';
+ $regexp = '/^([a-z\-]+\/[a-z0-9\-\.\+]+)(;\s.+)?$/';
/* Fileinfo extension - most reliable method
*