summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-10-04 17:23:27 +0200
committerAndrey Andreev <narf@bofh.bg>2011-10-04 17:23:27 +0200
commitf7bdd0fc3324db3085a62b3c1f1ebb751053c429 (patch)
tree2804d26dd9b335eb87ab0377038ee277666c8d58
parent4960bb6762d4455a4bda9d09f6e942e5a0fbcdb2 (diff)
parentf300fb27a54c4eb6018dffb77a5e541416ffa5c2 (diff)
Merge branch 'ci-issue-60' of github.com:narfbg/CodeIgniter into ci-issue-60
-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 67551fbbd..fc3de0329 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1021,7 +1021,7 @@ class CI_Upload {
protected function _file_mime_type($file)
{
// Use if the Fileinfo extension, if available (only versions above 5.3 support the FILEINFO_MIME_TYPE flag)
- if ( (float) substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
+ if (is_php('5.3') && function_exists('finfo_file'))
{
$finfo = new finfo(FILEINFO_MIME_TYPE);
if ($finfo !== FALSE) // This is possible, if there is no magic MIME database file found on the system