aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/contents.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/contents.php b/lib/contents.php
index 00202c44..ca0ef8bc 100644
--- a/lib/contents.php
+++ b/lib/contents.php
@@ -163,13 +163,15 @@ function getMimeType($url) {
static $mime = null;
if (is_null($mime)) {
+ // Default values, overriden by /etc/mime.types when present
$mime = array(
'jpg' => 'image/jpeg',
'gif' => 'image/gif',
'png' => 'image/png',
'image' => 'image/*'
);
- if (is_file('/etc/mime.types')) {
+ // '@' is used to mute open_basedir warning, see issue #818
+ if (@is_readable('/etc/mime.types')) {
$file = fopen('/etc/mime.types', 'r');
while(($line = fgets($file)) !== false) {
$line = trim(preg_replace('/#.*/', '', $line));