mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7071 from jcfischer/master 

close statement in MimeType detection is executed [#7069]
This commit is contained in:
Thomas Müller 2014-02-10 10:27:21 +01:00
parent e7db48cd7f 11f46e121c
commit 8de9758fee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/files/type/detection.php
View File

@ -72,11 +72,12 @@ class Detection {
and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME) and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
) { ) {
$info = @strtolower(finfo_file($finfo, $path)); $info = @strtolower(finfo_file($finfo, $path));
finfo_close($finfo);
if ($info) { if ($info) {
$mimeType = substr($info, 0, strpos($info, ';')); $mimeType = substr($info, 0, strpos($info, ';'));
return empty($mimeType) ? 'application/octet-stream' : $mimeType; return empty($mimeType) ? 'application/octet-stream' : $mimeType;
} }
finfo_close($finfo);
} }
$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://'); $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) { if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {