From 403e3f4b223e71e4797dbf948b578fc6d14b7c2e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 18 Jul 2008 07:38:56 -0400
Subject: [PATCH] - use fallback if mime_content_type() returns false (#1485222)
---
program/include/rcube_shared.inc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 801dac7..4cab270 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -561,13 +561,17 @@
$mime_magic = $CONFIG['mime_magic'];
if (function_exists('mime_content_type')) {
- return mime_content_type($path);
+ $finfo = mime_content_type($path);
+ if ($finfo)
+ return $finfo;
}
+
if (!extension_loaded('fileinfo')) {
if (!dl('fileinfo.' . PHP_SHLIB_SUFFIX)) {
return $failover;
}
}
+
$finfo = finfo_open(FILEINFO_MIME, $mime_magic);
if (!$finfo) {
return $failover;
--
Gitblit v1.9.1