From 3e63802071bda6e7e8766542e3cb463bd43f23d2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Jan 2010 13:26:56 -0500
Subject: [PATCH] - Don't use dl() (#1486457)
---
program/include/rcube_shared.inc | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index e93e9ae..610023f 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -444,20 +444,15 @@
$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) {
--
Gitblit v1.9.1