diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-28 18:26:56 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-28 18:26:56 +0000 |
| commit | d4bb791d44cc06bbab82eb8a8a9ce059f4428e5a (patch) | |
| tree | 167b479328a6a7218e700c5ce19d8eb263717a1a /roundcubemail | |
| parent | 979e73b7c8f7981413f95745b47e3abfd6270995 (diff) | |
- Don't use dl() (#1486457)
git-svn-id: https://svn.roundcube.net/trunk@3236 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/program/include/rcube_shared.inc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc index e93e9aefe..610023f69 100644 --- a/roundcubemail/program/include/rcube_shared.inc +++ b/roundcubemail/program/include/rcube_shared.inc @@ -444,20 +444,15 @@ function rc_mime_content_type($path, $name, $failover = 'application/octet-strea $mime_type = $mime_ext[$suffix]; } // try fileinfo extension if available - if (!$mime_type) { - if (!extension_loaded('fileinfo')) { - @dl('fileinfo.' . PHP_SHLIB_SUFFIX); - } - if (function_exists('finfo_open')) { - if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) { - $mime_type = finfo_file($finfo, $path); - finfo_close($finfo); - } + if (!$mime_type && 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 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 if (!$mime_type) { |