- Don't use dl() (#1486457)

release-0.6
alecpl 15 years ago
parent 74be739c40
commit 3e63802071

@ -444,20 +444,15 @@ function rc_mime_content_type($path, $name, $failover = 'application/octet-strea
$mime_type = $mime_ext[$suffix]; $mime_type = $mime_ext[$suffix];
} }
// try fileinfo extension if available // try fileinfo extension if available
if (!$mime_type) { if (!$mime_type && function_exists('finfo_open')) {
if (!extension_loaded('fileinfo')) { if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
@dl('fileinfo.' . PHP_SHLIB_SUFFIX); $mime_type = finfo_file($finfo, $path);
} finfo_close($finfo);
if (function_exists('finfo_open')) {
if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
$mime_type = finfo_file($finfo, $path);
finfo_close($finfo);
}
} }
} }
// try PHP's mime_content_type // try PHP's mime_content_type
if (!$mime_type && function_exists('mime_content_type')) { if (!$mime_type && function_exists('mime_content_type')) {
$mime_type = mime_content_type($path); $mime_type = mime_content_type($path);
} }
// fall back to user-submitted string // fall back to user-submitted string
if (!$mime_type) { if (!$mime_type) {

Loading…
Cancel
Save