Merge pull request #374 from nextcloud/backport/373/stable16

nickvergessen · web-flow · commit 365da62ee949 · 2019-05-15T11:35:10.000+02:00
[stable16] Fall back to application/octet-stream instead of using an invalid mim…
diff --git a/lib/Controller/APIv2.php b/lib/Controller/APIv2.php
@@ -381,11 +381,11 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
 					'x' => 150,
 					'y' => 150,
 				]);
-				$preview['mimeType'] = $fileInfo->getMimetype();
+				$preview['mimeType'] = $fileInfo->getMimetype() ?: 'application/octet-stream';
 				$preview['isMimeTypeIcon'] = false;
 			} else {
-				$preview['source'] = $this->getPreviewPathFromMimeType($fileInfo->getMimetype());
-				$preview['mimeType'] = $fileInfo->getMimetype();
+				$preview['mimeType'] = $fileInfo->getMimetype() ?: 'application/octet-stream';
+				$preview['source'] = $this->getPreviewPathFromMimeType($preview['mimeType']);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -381,11 +381,11 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr`
`381`	`381`	`'x' => 150,`
`382`	`382`	`'y' => 150,`
`383`	`383`	`]);`
`384`		`- $preview['mimeType'] = $fileInfo->getMimetype();`
	`384`	`+ $preview['mimeType'] = $fileInfo->getMimetype() ?: 'application/octet-stream';`
`385`	`385`	`$preview['isMimeTypeIcon'] = false;`
`386`	`386`	`} else {`
`387`		`- $preview['source'] = $this->getPreviewPathFromMimeType($fileInfo->getMimetype());`
`388`		`- $preview['mimeType'] = $fileInfo->getMimetype();`
	`387`	`+ $preview['mimeType'] = $fileInfo->getMimetype() ?: 'application/octet-stream';`
	`388`	`+ $preview['source'] = $this->getPreviewPathFromMimeType($preview['mimeType']);`
`389`	`389`	`}`
`390`	`390`	`}`
`391`	`391`