summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-13 08:31:18 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-13 08:31:18 +0200
commit1006ec56ceb2c7c5bc14a5401d46767cb4b72e6c (patch)
treeadc87050a1f4f43eb2d41009e0d2416992d07e8b /lib/private/files
parent52e9c94e08d69854697fc1a0b8df185fd57ae9f8 (diff)
parent8cac236135c4b07983e824c1ff0b9235aa0a0762 (diff)
downloadnextcloud-server-1006ec56ceb2c7c5bc14a5401d46767cb4b72e6c.tar.gz
nextcloud-server-1006ec56ceb2c7c5bc14a5401d46767cb4b72e6c.zip
Merge pull request #17481 from rullzer/mimetype-list
Move mimetypes.list.php to config/mimetypemapping.dist.json
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/type/detection.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 61ca32a5ed1..3287375bc79 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -66,7 +66,7 @@ class Detection {
// Update the alternative mimetypes to avoid having to look them up each time.
foreach ($this->mimetypes as $mimeType) {
- $this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?: $mimeType[0];
+ $this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1]: $mimeType[0];
}
}