Merge pull request #1490 from dereuromark/2.4-mime

2.4 mime
This commit is contained in:
Mark Story 2013-08-07 14:52:01 -07:00
commit 2dd423644b

View file

@ -557,9 +557,14 @@ class File {
} }
if (function_exists('finfo_open')) { if (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME); $finfo = finfo_open(FILEINFO_MIME);
list($type, $charset) = explode(';', finfo_file($finfo, $this->pwd())); $finfo = finfo_file($finfo, $this->pwd());
if (!$finfo) {
return false;
}
list($type, $charset) = explode(';', $finfo);
return $type; return $type;
} elseif (function_exists('mime_content_type')) { }
if (function_exists('mime_content_type')) {
return mime_content_type($this->pwd()); return mime_content_type($this->pwd());
} }
return false; return false;