diff options
| author | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
|---|---|---|
| committer | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
| commit | e45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (patch) | |
| tree | 81a8720574945f47edb0617842c331c6e1f476a1 /system/libraries/Upload.php | |
| parent | 1f9a40f2465ee135d4ed0292d51a1ed6571173f0 (diff) | |
| parent | b25bf9db4af963269362e16cec0a99326c4439ad (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 56062befb..66e91c5b6 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1033,7 +1033,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 (is_php('5.3') && function_exists('finfo_file')) + if ( (float) substr(phpversion(), 0, 3) >= 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 @@ -1086,4 +1086,4 @@ class CI_Upload { // END Upload Class /* End of file Upload.php */ -/* Location: ./system/libraries/Upload.php */ +/* Location: ./system/libraries/Upload.php */
\ No newline at end of file |